← Back to branch summary

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

« back to all changes in this revision

Viewing changes to samples/widgets/fontpicker.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/widgets/fontpicker.cpp
103
103
    wxBoxSizer *m_sizer;
104
104
 
105
105
private:
106
 
    DECLARE_EVENT_TABLE()
 
106
    wxDECLARE_EVENT_TABLE();
107
107
    DECLARE_WIDGETS_PAGE(FontPickerWidgetsPage)
108
108
};
109
109
 
111
111
// event tables
112
112
// ----------------------------------------------------------------------------
113
113
 
114
 
BEGIN_EVENT_TABLE(FontPickerWidgetsPage, WidgetsPage)
 
114
wxBEGIN_EVENT_TABLE(FontPickerWidgetsPage, WidgetsPage)
115
115
    EVT_BUTTON(PickerPage_Reset, FontPickerWidgetsPage::OnButtonReset)
116
116
 
117
117
    EVT_FONTPICKER_CHANGED(PickerPage_Font, FontPickerWidgetsPage::OnFontChange)
118
118
 
119
119
    EVT_CHECKBOX(wxID_ANY, FontPickerWidgetsPage::OnCheckBox)
120
 
END_EVENT_TABLE()
 
120
wxEND_EVENT_TABLE()
121
121
 
122
122
// ============================================================================
123
123
// implementation