← Back to branch summary

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

« back to all changes in this revision

Viewing changes to samples/menu/menu.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/menu/menu.cpp
182
182
    // the previous log target
183
183
    wxLog *m_logOld;
184
184
 
185
 
    DECLARE_EVENT_TABLE()
 
185
    wxDECLARE_EVENT_TABLE();
186
186
};
187
187
 
188
188
class MyDialog : public wxDialog
227
227
    wxTextCtrl *m_textctrl;
228
228
#endif
229
229
 
230
 
    DECLARE_EVENT_TABLE()
 
230
    wxDECLARE_EVENT_TABLE();
231
231
};
232
232
 
233
233
// A small helper class which intercepts all menu events and logs them
246
246
private:
247
247
    MyFrame *m_frame;
248
248
 
249
 
    DECLARE_EVENT_TABLE()
 
249
    wxDECLARE_EVENT_TABLE();
250
250
};
251
251
 
252
252
// ----------------------------------------------------------------------------
323
323
// event tables
324
324
// ----------------------------------------------------------------------------
325
325
 
326
 
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
326
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
327
327
    EVT_MENU(Menu_File_Quit,     MyFrame::OnQuit)
328
328
#if USE_LOG_WINDOW
329
329
    EVT_MENU(Menu_File_ClearLog, MyFrame::OnClearLog)
387
387
    EVT_MENU_HIGHLIGHT_ALL(MyFrame::OnMenuHighlight)
388
388
 
389
389
    EVT_SIZE(MyFrame::OnSize)
390
 
END_EVENT_TABLE()
 
390
wxEND_EVENT_TABLE()
391
391
 
392
 
BEGIN_EVENT_TABLE(MyDialog, wxDialog)
 
392
wxBEGIN_EVENT_TABLE(MyDialog, wxDialog)
393
393
#if USE_CONTEXT_MENU
394
394
    EVT_CONTEXT_MENU(MyDialog::OnContextMenu)
395
395
#else
398
398
    EVT_MENU_OPEN(MyDialog::OnMenuOpen)
399
399
    EVT_MENU_CLOSE(MyDialog::OnMenuClose)
400
400
    EVT_MENU_HIGHLIGHT_ALL(MyDialog::OnMenuHighlight)
401
 
END_EVENT_TABLE()
 
401
wxEND_EVENT_TABLE()
402
402
 
403
 
BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler)
 
403
wxBEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler)
404
404
    EVT_MENU(wxID_ANY, MyEvtHandler::OnMenuEvent)
405
 
END_EVENT_TABLE()
 
405
wxEND_EVENT_TABLE()
406
406
 
407
407
// ============================================================================
408
408
// implementation