← Back to branch summary

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

« back to all changes in this revision

Viewing changes to samples/widgets/choice.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/choice.cpp
136
136
               *m_textDelete;
137
137
 
138
138
private:
139
 
    DECLARE_EVENT_TABLE()
 
139
    wxDECLARE_EVENT_TABLE();
140
140
    DECLARE_WIDGETS_PAGE(ChoiceWidgetsPage)
141
141
};
142
142
 
144
144
// event tables
145
145
// ----------------------------------------------------------------------------
146
146
 
147
 
BEGIN_EVENT_TABLE(ChoiceWidgetsPage, WidgetsPage)
 
147
wxBEGIN_EVENT_TABLE(ChoiceWidgetsPage, WidgetsPage)
148
148
    EVT_BUTTON(ChoicePage_Reset, ChoiceWidgetsPage::OnButtonReset)
149
149
    EVT_BUTTON(ChoicePage_Change, ChoiceWidgetsPage::OnButtonChange)
150
150
    EVT_BUTTON(ChoicePage_Delete, ChoiceWidgetsPage::OnButtonDelete)
171
171
 
172
172
    EVT_CHECKBOX(wxID_ANY, ChoiceWidgetsPage::OnCheckOrRadioBox)
173
173
    EVT_RADIOBOX(wxID_ANY, ChoiceWidgetsPage::OnCheckOrRadioBox)
174
 
END_EVENT_TABLE()
 
174
wxEND_EVENT_TABLE()
175
175
 
176
176
// ============================================================================
177
177
// implementation