← Back to branch summary

~ubuntu-branches/ubuntu/wily/wxwidgets3.0/wily-proposed

« back to all changes in this revision

Viewing changes to samples/ribbon/ribbondemo.cpp

  • Committer: Package Import Robot
  • Author(s): Olly Betts
  • Date: 2014-06-18 12:42:22 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20140618124222-y7t2vpsije1cesxy
Tags: 3.0.1-1
* New upstream release
  + Incorporates most of the patches we were carrying - only one left is:
    wx-config-conditionalise-webview-in-std.patch
* Drop versioning of dependencies from run-time libraries to wx-common -
  this will make the transition to the next wx version harder, and also
  makes backporting to wheezy more work.
* Mark -dbg packages as "Multi-Arch: same".
* Correct short descriptions of the webview packages to not just be
  copies of the corresponding media package's short description.
* Wrap 81 character line in package description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
samples/ribbon/ribbondemo.cpp
169
169
    bool m_bChecked;
170
170
    wxString m_new_text;
171
171
 
172
 
    DECLARE_EVENT_TABLE()
 
172
    wxDECLARE_EVENT_TABLE();
173
173
};
174
174
 
175
175
// -- implementations --
185
185
    return true;
186
186
}
187
187
 
188
 
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
188
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
189
189
EVT_RIBBONBUTTONBAR_CLICKED(ID_ENABLE, MyFrame::OnEnable)
190
190
EVT_RIBBONBUTTONBAR_CLICKED(ID_DISABLE, MyFrame::OnDisable)
191
191
EVT_RIBBONBUTTONBAR_CLICKED(ID_DISABLED, MyFrame::OnDisabled)
244
244
EVT_RIBBONBAR_TOGGLED(wxID_ANY, MyFrame::OnRibbonBarToggled)
245
245
EVT_RIBBONBAR_HELP_CLICK(wxID_ANY, MyFrame::OnRibbonBarHelpClicked)
246
246
EVT_SIZE(MyFrame::OnSizeEvent)
247
 
END_EVENT_TABLE()
 
247
wxEND_EVENT_TABLE()
248
248
 
249
249
#include "align_center.xpm"
250
250
#include "align_left.xpm"