diff --git a/samples/access/accesstest.cpp b/samples/access/accesstest.cpp index 1cef915a5b..83b85fae24 100644 --- a/samples/access/accesstest.cpp +++ b/samples/access/accesstest.cpp @@ -107,7 +107,7 @@ private: wxTextCtrl* m_textCtrl; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -136,11 +136,11 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(AccessTest_Quit, MyFrame::OnQuit) EVT_MENU(AccessTest_Query, MyFrame::OnQuery) EVT_MENU(AccessTest_About, MyFrame::OnAbout) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #endif // wxUSE_ACCESSIBILITY diff --git a/samples/animate/anitest.cpp b/samples/animate/anitest.cpp index ca20b75ded..f452fbe3b3 100644 --- a/samples/animate/anitest.cpp +++ b/samples/animate/anitest.cpp @@ -62,7 +62,7 @@ enum ID_SET_BGCOLOR }; -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(ID_PLAY, MyFrame::OnPlay) EVT_MENU(ID_SET_NULL_ANIMATION, MyFrame::OnSetNullAnimation) EVT_MENU(ID_SET_INACTIVE_BITMAP, MyFrame::OnSetInactiveBitmap) @@ -78,7 +78,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_SIZE(MyFrame::OnSize) EVT_UPDATE_UI(wxID_ANY, MyFrame::OnUpdateUI) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // =========================================================================== // implementation diff --git a/samples/animate/anitest.h b/samples/animate/anitest.h index 06bc1139b4..d56b20caa4 100644 --- a/samples/animate/anitest.h +++ b/samples/animate/anitest.h @@ -48,5 +48,5 @@ protected: wxAnimationCtrl* m_animationCtrl; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; diff --git a/samples/artprov/artbrows.cpp b/samples/artprov/artbrows.cpp index c1888648d4..d93d0905d7 100644 --- a/samples/artprov/artbrows.cpp +++ b/samples/artprov/artbrows.cpp @@ -123,10 +123,10 @@ static void FillBitmaps(wxImageList *images, wxListCtrl *list, #include "null.xpm" -BEGIN_EVENT_TABLE(wxArtBrowserDialog, wxDialog) +wxBEGIN_EVENT_TABLE(wxArtBrowserDialog, wxDialog) EVT_LIST_ITEM_SELECTED(wxID_ANY, wxArtBrowserDialog::OnSelectItem) EVT_CHOICE(wxID_ANY, wxArtBrowserDialog::OnChooseClient) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent) : wxDialog(parent, wxID_ANY, wxT("Art resources browser"), diff --git a/samples/artprov/artbrows.h b/samples/artprov/artbrows.h index c9ec073271..977dce30f3 100644 --- a/samples/artprov/artbrows.h +++ b/samples/artprov/artbrows.h @@ -35,7 +35,7 @@ private: wxStaticText *m_text; wxString m_client; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; #endif // __ARTBROWS_H__ diff --git a/samples/artprov/arttest.cpp b/samples/artprov/arttest.cpp index 61affa05bc..5afe3575a0 100644 --- a/samples/artprov/arttest.cpp +++ b/samples/artprov/arttest.cpp @@ -52,7 +52,7 @@ private: void OnBrowser(wxCommandEvent& event); void OnPlugProvider(wxCommandEvent& event); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -72,7 +72,7 @@ enum // event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(ID_Quit, MyFrame::OnQuit) #if wxUSE_LOG EVT_MENU(ID_Logs, MyFrame::OnLogs) @@ -80,7 +80,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) EVT_MENU(ID_Browser, MyFrame::OnBrowser) EVT_MENU(ID_PlugProvider, MyFrame::OnPlugProvider) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() IMPLEMENT_APP(MyApp) diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp index 9b9eff4cee..eabecd6b6c 100644 --- a/samples/aui/auidemo.cpp +++ b/samples/aui/auidemo.cpp @@ -173,7 +173,7 @@ private: long m_notebook_style; long m_notebook_theme; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; @@ -250,14 +250,14 @@ private: wxAuiManager* m_mgr; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(wxSizeReportCtrl, wxControl) +wxBEGIN_EVENT_TABLE(wxSizeReportCtrl, wxControl) EVT_PAINT(wxSizeReportCtrl::OnPaint) EVT_SIZE(wxSizeReportCtrl::OnSize) EVT_ERASE_BACKGROUND(wxSizeReportCtrl::OnEraseBackground) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() class SettingsPanel : public wxPanel @@ -539,10 +539,10 @@ private: wxBitmapButton* m_border_color; wxBitmapButton* m_gripper_color; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(SettingsPanel, wxPanel) +wxBEGIN_EVENT_TABLE(SettingsPanel, wxPanel) EVT_SPINCTRL(ID_PaneBorderSize, SettingsPanel::OnPaneBorderSize) EVT_SPINCTRL(ID_SashSize, SettingsPanel::OnSashSize) EVT_SPINCTRL(ID_CaptionSize, SettingsPanel::OnCaptionSize) @@ -556,7 +556,7 @@ BEGIN_EVENT_TABLE(SettingsPanel, wxPanel) EVT_BUTTON(ID_ActiveCaptionTextColor, SettingsPanel::OnSetColor) EVT_BUTTON(ID_BorderColor, SettingsPanel::OnSetColor) EVT_BUTTON(ID_GripperColor, SettingsPanel::OnSetColor) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() bool MyApp::OnInit() @@ -574,7 +574,7 @@ bool MyApp::OnInit() return true; } -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_ERASE_BACKGROUND(MyFrame::OnEraseBackground) EVT_SIZE(MyFrame::OnSize) EVT_MENU(MyFrame::ID_CreateTree, MyFrame::OnCreateTree) @@ -653,7 +653,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_AUINOTEBOOK_ALLOW_DND(wxID_ANY, MyFrame::OnAllowNotebookDnD) EVT_AUINOTEBOOK_PAGE_CLOSE(wxID_ANY, MyFrame::OnNotebookPageClose) EVT_AUINOTEBOOK_PAGE_CLOSED(wxID_ANY, MyFrame::OnNotebookPageClosed) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame(wxWindow* parent, diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp index 9a5466b90b..9b1d48bbf6 100644 --- a/samples/calendar/calendar.cpp +++ b/samples/calendar/calendar.cpp @@ -121,7 +121,7 @@ private: bool m_usingGeneric; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Define a new frame type: this is going to be our main frame @@ -181,7 +181,7 @@ private: wxTextCtrl *m_logWindow; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; #if wxUSE_DATEPICKCTRL @@ -202,7 +202,7 @@ private: wxStaticText *m_dateText; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; #endif // wxUSE_DATEPICKCTRL @@ -278,7 +278,7 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Calendar_File_About, MyFrame::OnAbout) EVT_MENU(Calendar_File_ClearLog, MyFrame::OnClearLog) EVT_MENU(Calendar_File_Quit, MyFrame::OnQuit) @@ -324,15 +324,15 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #endif EVT_UPDATE_UI(Calendar_Cal_Special, MyFrame::OnUpdateUIGenericOnly) EVT_UPDATE_UI(Calendar_Cal_SurroundWeeks, MyFrame::OnUpdateUIGenericOnly) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(MyPanel, wxPanel) +wxBEGIN_EVENT_TABLE(MyPanel, wxPanel) EVT_CALENDAR(Calendar_CalCtrl, MyPanel::OnCalendar) EVT_CALENDAR_PAGE_CHANGED(Calendar_CalCtrl, MyPanel::OnCalMonthChange) EVT_CALENDAR_SEL_CHANGED(Calendar_CalCtrl, MyPanel::OnCalendarChange) EVT_CALENDAR_WEEKDAY_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekDayClick) EVT_CALENDAR_WEEK_CLICKED(Calendar_CalCtrl, MyPanel::OnCalendarWeekClick) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a @@ -892,9 +892,9 @@ void MyPanel::LimitDateRange(bool on) #if wxUSE_DATEPICKCTRL -BEGIN_EVENT_TABLE(MyDateDialog, wxDialog) +wxBEGIN_EVENT_TABLE(MyDateDialog, wxDialog) EVT_DATE_CHANGED(wxID_ANY, MyDateDialog::OnDateChange) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyDateDialog::MyDateDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle) : wxDialog(parent, wxID_ANY, wxString(wxT("Calendar: Choose a date"))) @@ -950,9 +950,9 @@ void MyDateDialog::OnDateChange(wxDateEvent& event) #if wxUSE_TIMEPICKCTRL -BEGIN_EVENT_TABLE(MyTimeDialog, wxDialog) +wxBEGIN_EVENT_TABLE(MyTimeDialog, wxDialog) EVT_TIME_CHANGED(wxID_ANY, MyTimeDialog::OnTimeChange) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyTimeDialog::MyTimeDialog(wxWindow *parent) : wxDialog(parent, wxID_ANY, wxString(wxT("Calendar: Choose time"))) diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp index 57f5714db3..dd827a9e73 100644 --- a/samples/caret/caret.cpp +++ b/samples/caret/caret.cpp @@ -105,8 +105,8 @@ private: // the text wxChar *m_text; - DECLARE_DYNAMIC_CLASS(MyCanvas) - DECLARE_EVENT_TABLE() + wxDECLARE_DYNAMIC_CLASS(MyCanvas); + wxDECLARE_EVENT_TABLE(); }; @@ -128,7 +128,7 @@ private: MyCanvas *m_canvas; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -156,13 +156,13 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Caret_Quit, MyFrame::OnQuit) EVT_MENU(Caret_About, MyFrame::OnAbout) EVT_MENU(Caret_SetBlinkTime, MyFrame::OnSetBlinkTime) EVT_MENU(Caret_SetFontSize, MyFrame::OnSetFontSize) EVT_MENU(Caret_Move, MyFrame::OnCaretMove) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a @@ -296,11 +296,11 @@ void MyFrame::OnSetFontSize(wxCommandEvent& WXUNUSED(event)) IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow) -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) +wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_PAINT(MyCanvas::OnPaint) EVT_SIZE(MyCanvas::OnSize) EVT_CHAR(MyCanvas::OnChar) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyCanvas::MyCanvas( wxWindow *parent ) : wxScrolledWindow( parent, wxID_ANY, diff --git a/samples/clipboard/clipboard.cpp b/samples/clipboard/clipboard.cpp index 9276f79ae7..af02fefc06 100644 --- a/samples/clipboard/clipboard.cpp +++ b/samples/clipboard/clipboard.cpp @@ -63,7 +63,7 @@ private: bool m_clipboardSupportsText; #endif - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; enum @@ -74,7 +74,7 @@ enum ID_Text = 101 }; -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(ID_Quit, MyFrame::OnQuit) EVT_MENU(ID_About, MyFrame::OnAbout) EVT_BUTTON(ID_Write, MyFrame::OnWriteClipboardContents) @@ -82,7 +82,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #if USE_ASYNCHRONOUS_CLIPBOARD_REQUEST EVT_CLIPBOARD_CHANGED(MyFrame::OnClipboardChange) #endif -END_EVENT_TABLE() +wxEND_EVENT_TABLE() IMPLEMENT_APP(MyApp) diff --git a/samples/collpane/collpane.cpp b/samples/collpane/collpane.cpp index d83d9cd84e..41c17ac1b0 100644 --- a/samples/collpane/collpane.cpp +++ b/samples/collpane/collpane.cpp @@ -102,7 +102,7 @@ private: wxCollapsiblePane *m_collPane; wxBoxSizer *m_paneSizer; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); wxDECLARE_NO_COPY_CLASS(MyFrame); }; @@ -118,7 +118,7 @@ private: wxCollapsiblePane *m_collPane; wxGridSizer *m_paneSizer; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); wxDECLARE_NO_COPY_CLASS(MyDialog); }; @@ -151,7 +151,7 @@ bool MyApp::OnInit() // MyFrame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(PANE_COLLAPSE, MyFrame::OnCollapse) EVT_MENU(PANE_EXPAND, MyFrame::OnExpand) EVT_MENU(PANE_SETLABEL, MyFrame::OnSetLabel) @@ -161,7 +161,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_UPDATE_UI(PANE_COLLAPSE, MyFrame::OnCollapseUpdateUI) EVT_UPDATE_UI(PANE_EXPAND, MyFrame::OnExpandUpdateUI) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // My frame constructor MyFrame::MyFrame() @@ -278,11 +278,11 @@ enum PANEDLG_TOGGLESTATUS_BTN = wxID_HIGHEST }; -BEGIN_EVENT_TABLE(MyDialog, wxDialog) +wxBEGIN_EVENT_TABLE(MyDialog, wxDialog) EVT_BUTTON(PANEDLG_TOGGLESTATUS_BTN, MyDialog::OnToggleStatus) EVT_COLLAPSIBLEPANE_CHANGED(wxID_ANY, MyDialog::OnPaneChanged) EVT_BUTTON(PANE_BUTTON, MyDialog::OnAlignButton) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyDialog::MyDialog(wxFrame *parent) : wxDialog(parent, wxID_ANY, wxT("Test dialog"), diff --git a/samples/combo/combo.cpp b/samples/combo/combo.cpp index ecf48986a6..bd0efe1134 100644 --- a/samples/combo/combo.cpp +++ b/samples/combo/combo.cpp @@ -94,7 +94,7 @@ protected: private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -122,7 +122,7 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_TEXT(wxID_ANY,MyFrame::OnComboBoxUpdate) EVT_TEXT_ENTER(wxID_ANY,MyFrame::OnComboBoxUpdate) EVT_COMBOBOX(wxID_ANY,MyFrame::OnComboBoxUpdate) @@ -132,7 +132,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(ComboCtrl_About, MyFrame::OnAbout) EVT_IDLE(MyFrame::OnIdle) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a @@ -351,16 +351,16 @@ protected: int m_itemHere; // hot item in popup private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(ListViewComboPopup, wxListView) +wxBEGIN_EVENT_TABLE(ListViewComboPopup, wxListView) EVT_MOTION(ListViewComboPopup::OnMouseMove) // NOTE: Left down event is used instead of left up right now // since MSW wxListCtrl doesn't seem to emit left ups // consistently. EVT_LEFT_DOWN(ListViewComboPopup::OnMouseClick) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ---------------------------------------------------------------------------- @@ -489,16 +489,16 @@ protected: wxTreeItemId m_itemHere; // hot item in popup private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(TreeCtrlComboPopup, wxTreeCtrl) +wxBEGIN_EVENT_TABLE(TreeCtrlComboPopup, wxTreeCtrl) EVT_MOTION(TreeCtrlComboPopup::OnMouseMove) // NOTE: Left down event is used instead of left up right now // since MSW wxTreeCtrl doesn't seem to emit left ups // consistently. EVT_LEFT_DOWN(TreeCtrlComboPopup::OnMouseClick) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ---------------------------------------------------------------------------- // wxComboCtrl with custom popup animation, using wxWindow::ShowWithEffect(). diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp index f1b4f7881b..aee3da1db5 100644 --- a/samples/config/conftest.cpp +++ b/samples/config/conftest.cpp @@ -59,18 +59,18 @@ private: wxTextCtrl *m_text; wxCheckBox *m_check; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_EXIT, MyFrame::OnQuit) EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) EVT_MENU(wxID_DELETE, MyFrame::OnDelete) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 24482f301f..ff73375309 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -178,7 +178,7 @@ public: private: wxLog *m_logTargetOld; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyFrame: public wxFrame @@ -232,7 +232,7 @@ private: MyPanel *m_panel; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // a button which intercepts double clicks (for testing...) @@ -256,7 +256,7 @@ public: } private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // a combo which intercepts chars (to test Windows behaviour) @@ -286,7 +286,7 @@ protected: } private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // a radiobox which handles focus set/kill (for testing) @@ -324,7 +324,7 @@ protected: } private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // a choice which handles focus set/kill (for testing) @@ -358,7 +358,7 @@ protected: } private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; @@ -503,7 +503,7 @@ const int ID_SIZER_CHECKBIG = 206; const int ID_HYPERLINK = 300; -BEGIN_EVENT_TABLE(MyPanel, wxPanel) +wxBEGIN_EVENT_TABLE(MyPanel, wxPanel) EVT_IDLE ( MyPanel::OnIdle) EVT_BOOKCTRL_PAGE_CHANGING(ID_BOOK, MyPanel::OnPageChanging) EVT_BOOKCTRL_PAGE_CHANGED(ID_BOOK, MyPanel::OnPageChanged) @@ -581,29 +581,29 @@ EVT_CHECKBOX (ID_SIZER_CHECK4, MyPanel::OnSizerCheck) EVT_CHECKBOX (ID_SIZER_CHECK14, MyPanel::OnSizerCheck) EVT_CHECKBOX (ID_SIZER_CHECKBIG, MyPanel::OnSizerCheck) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(MyButton, wxButton) +wxBEGIN_EVENT_TABLE(MyButton, wxButton) EVT_LEFT_DCLICK(MyButton::OnDClick) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(MyComboBox, wxComboBox) +wxBEGIN_EVENT_TABLE(MyComboBox, wxComboBox) EVT_CHAR(MyComboBox::OnChar) EVT_KEY_DOWN(MyComboBox::OnKeyDown) EVT_KEY_UP(MyComboBox::OnKeyUp) EVT_SET_FOCUS(MyComboBox::OnFocusGot) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(MyRadioBox, wxRadioBox) +wxBEGIN_EVENT_TABLE(MyRadioBox, wxRadioBox) EVT_SET_FOCUS(MyRadioBox::OnFocusGot) EVT_KILL_FOCUS(MyRadioBox::OnFocusLost) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(MyChoice, wxChoice) +wxBEGIN_EVENT_TABLE(MyChoice, wxChoice) EVT_SET_FOCUS(MyChoice::OnFocusGot) EVT_KILL_FOCUS(MyChoice::OnFocusLost) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation @@ -1809,7 +1809,7 @@ MyPanel::~MyPanel() // MyFrame //---------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(CONTROLS_QUIT, MyFrame::OnQuit) EVT_MENU(CONTROLS_ABOUT, MyFrame::OnAbout) EVT_MENU(CONTROLS_CLEAR_LOG, MyFrame::OnClearLog) @@ -1832,7 +1832,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MOVE(MyFrame::OnMove) EVT_IDLE(MyFrame::OnIdle) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame(const wxChar *title, int x, int y) : wxFrame(NULL, wxID_ANY, title, wxPoint(x, y), wxSize(700, 450)) diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index 5deed638e9..c04156b0e1 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -155,7 +155,7 @@ private: wxLog *m_logOld; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; @@ -296,7 +296,7 @@ enum ID_ADD_TREE_CONTAINER_ITEM = 403 }; -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU_RANGE( ID_MULTIPLE, ID_VERT_RULES, MyFrame::OnStyleChange ) EVT_MENU( ID_EXIT, MyFrame::OnQuit ) EVT_MENU( ID_ABOUT, MyFrame::OnAbout ) @@ -355,7 +355,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_DATAVIEW_COLUMN_HEADER_CLICK(ID_ATTR_CTRL, MyFrame::OnAttrHeaderClick) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h): wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)) diff --git a/samples/debugrpt/debugrpt.cpp b/samples/debugrpt/debugrpt.cpp index c5ac83a8ba..fa372e7044 100644 --- a/samples/debugrpt/debugrpt.cpp +++ b/samples/debugrpt/debugrpt.cpp @@ -169,7 +169,7 @@ private: int m_numLines; wxDECLARE_NO_COPY_CLASS(MyFrame); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -216,7 +216,7 @@ IMPLEMENT_APP(MyApp) // MyFrame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(DebugRpt_Quit, MyFrame::OnQuit) EVT_MENU(DebugRpt_Crash, MyFrame::OnReportForCrash) EVT_MENU(DebugRpt_Current, MyFrame::OnReportForCurrent) @@ -225,7 +225,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(DebugRpt_About, MyFrame::OnAbout) EVT_PAINT(MyFrame::OnPaint) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame() : wxFrame(NULL, wxID_ANY, wxT("wxWidgets Debug Report Sample"), diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 331f61c59a..6ac7ff131f 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -119,13 +119,13 @@ IMPLEMENT_APP(MyApp) -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) +wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_PAINT(MyCanvas::OnPaint) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) #if wxUSE_MSGDLG EVT_MENU(DIALOGS_MESSAGE_BOX, MyFrame::MessageBox) EVT_MENU(DIALOGS_MESSAGE_BOX_WINDOW_MODAL, MyFrame::MessageBoxWindowModal) @@ -264,25 +264,25 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #endif // wxUSE_RICHTOOLTIP EVT_MENU(wxID_EXIT, MyFrame::OnExit) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #if USE_MODAL_PRESENTATION - BEGIN_EVENT_TABLE(MyModalDialog, wxDialog) + wxBEGIN_EVENT_TABLE(MyModalDialog, wxDialog) EVT_BUTTON(wxID_ANY, MyModalDialog::OnButton) - END_EVENT_TABLE() + wxEND_EVENT_TABLE() - BEGIN_EVENT_TABLE(MyModelessDialog, wxDialog) + wxBEGIN_EVENT_TABLE(MyModelessDialog, wxDialog) EVT_BUTTON(DIALOGS_MODELESS_BTN, MyModelessDialog::OnButton) EVT_CLOSE(MyModelessDialog::OnClose) - END_EVENT_TABLE() + wxEND_EVENT_TABLE() #endif // USE_MODAL_PRESENTATION -BEGIN_EVENT_TABLE(StdButtonSizerDialog, wxDialog) +wxBEGIN_EVENT_TABLE(StdButtonSizerDialog, wxDialog) EVT_CHECKBOX(wxID_ANY, StdButtonSizerDialog::OnEvent) EVT_RADIOBUTTON(wxID_ANY, StdButtonSizerDialog::OnEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #if wxUSE_CMDLINE_PARSER @@ -1246,11 +1246,11 @@ private: wxStaticText *m_labelOrig; wxTextCtrl *m_text; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); wxDECLARE_NO_COPY_CLASS(MyRearrangeDialog); }; -BEGIN_EVENT_TABLE(MyRearrangeDialog, wxRearrangeDialog) +wxBEGIN_EVENT_TABLE(MyRearrangeDialog, wxRearrangeDialog) EVT_LISTBOX(wxID_ANY, MyRearrangeDialog::OnSelChange) EVT_UPDATE_UI(wxID_APPLY, MyRearrangeDialog::OnUpdateUIRename) @@ -1258,7 +1258,7 @@ BEGIN_EVENT_TABLE(MyRearrangeDialog, wxRearrangeDialog) EVT_TEXT_ENTER(wxID_ANY, MyRearrangeDialog::OnRename) EVT_BUTTON(wxID_APPLY, MyRearrangeDialog::OnRename) EVT_BUTTON(wxID_RESET, MyRearrangeDialog::OnReset) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() void MyFrame::Rearrange(wxCommandEvent& WXUNUSED(event)) { @@ -2059,13 +2059,13 @@ void MyFrame::OnStandardButtonsSizerDialog(wxCommandEvent& WXUNUSED(event)) #define ID_DISABLE_OK 102 #define ID_DISABLE_CANCEL 103 -BEGIN_EVENT_TABLE(TestDefaultActionDialog, wxDialog) +wxBEGIN_EVENT_TABLE(TestDefaultActionDialog, wxDialog) EVT_CHECKBOX(ID_CATCH_LISTBOX_DCLICK, TestDefaultActionDialog::OnCatchListBoxDClick) EVT_CHECKBOX(ID_DISABLE_OK, TestDefaultActionDialog::OnDisableOK) EVT_CHECKBOX(ID_DISABLE_CANCEL, TestDefaultActionDialog::OnDisableCancel) EVT_LISTBOX_DCLICK(ID_LISTBOX, TestDefaultActionDialog::OnListBoxDClick) EVT_TEXT_ENTER(wxID_ANY, TestDefaultActionDialog::OnTextEnter) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() TestDefaultActionDialog::TestDefaultActionDialog( wxWindow *parent ) : wxDialog( parent, -1, "Test default action" ) @@ -2790,8 +2790,8 @@ void StdButtonSizerDialog::EnableDisableControls() IMPLEMENT_CLASS(SettingsDialog, wxPropertySheetDialog) -BEGIN_EVENT_TABLE(SettingsDialog, wxPropertySheetDialog) -END_EVENT_TABLE() +wxBEGIN_EVENT_TABLE(SettingsDialog, wxPropertySheetDialog) +wxEND_EVENT_TABLE() SettingsDialog::SettingsDialog(wxWindow* win, int dialogType) { @@ -2985,10 +2985,10 @@ const TestMessageBoxDialog::BtnInfo TestMessageBoxDialog::ms_btnInfo[] = { wxHELP, "&Help" }, }; -BEGIN_EVENT_TABLE(TestMessageBoxDialog, wxDialog) +wxBEGIN_EVENT_TABLE(TestMessageBoxDialog, wxDialog) EVT_BUTTON(wxID_APPLY, TestMessageBoxDialog::OnApply) EVT_BUTTON(wxID_CLOSE, TestMessageBoxDialog::OnClose) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() TestMessageBoxDialog::TestMessageBoxDialog(wxWindow *parent) : wxDialog(parent, wxID_ANY, "Message Box Test Dialog", @@ -3265,9 +3265,9 @@ void TestMessageBoxDialog::OnClose(wxCommandEvent& WXUNUSED(event)) // TestRichMessageDialog // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(TestRichMessageDialog, TestMessageBoxDialog) +wxBEGIN_EVENT_TABLE(TestRichMessageDialog, TestMessageBoxDialog) EVT_BUTTON(wxID_APPLY, TestRichMessageDialog::OnApply) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() TestRichMessageDialog::TestRichMessageDialog(wxWindow *parent) : TestMessageBoxDialog(parent) diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h index 9ec21f0e01..6d9919dbec 100644 --- a/samples/dialogs/dialogs.h +++ b/samples/dialogs/dialogs.h @@ -148,7 +148,7 @@ public: void OnClose(wxCloseEvent& event); private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // A custom modal dialog @@ -164,7 +164,7 @@ private: *m_btnModeless, *m_btnDelete; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; #endif // USE_MODAL_PRESENTATION @@ -195,7 +195,7 @@ private: wxSizer *m_buttonsSizer; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Test harness for wxMessageDialog. @@ -264,7 +264,7 @@ private: wxCheckBox *m_chkNoDefault, *m_chkCentre; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); wxDECLARE_NO_COPY_CLASS(TestMessageBoxDialog); }; @@ -286,7 +286,7 @@ private: wxCheckBox *m_initialValueCheckBox; wxTextCtrl *m_textDetailed; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; #endif // wxUSE_RICHMSGDLG @@ -305,7 +305,7 @@ private: bool m_catchListBoxDClick; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; @@ -510,7 +510,7 @@ private: *m_infoBarAdvanced; #endif // wxUSE_INFOBAR - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyCanvas: public wxScrolledWindow @@ -526,7 +526,7 @@ public: private: void OnPaint(wxPaintEvent& event); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; diff --git a/samples/dialup/nettest.cpp b/samples/dialup/nettest.cpp index 6fb7773594..65211e4fd9 100644 --- a/samples/dialup/nettest.cpp +++ b/samples/dialup/nettest.cpp @@ -67,7 +67,7 @@ public: private: wxDialUpManager *m_dial; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Define a new frame type: this is going to be our main frame @@ -90,7 +90,7 @@ public: private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -114,15 +114,15 @@ enum // event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyApp, wxApp) +wxBEGIN_EVENT_TABLE(MyApp, wxApp) EVT_DIALUP_CONNECTED(MyApp::OnConnected) EVT_DIALUP_DISCONNECTED(MyApp::OnConnected) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(NetTest_Quit, MyFrame::OnQuit) EVT_MENU(NetTest_About, MyFrame::OnAbout) EVT_MENU(NetTest_HangUp, MyFrame::OnHangUp) @@ -133,7 +133,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_UPDATE_UI(NetTest_Dial, MyFrame::OnUpdateUI) EVT_IDLE(MyFrame::OnIdle) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/display/display.cpp b/samples/display/display.cpp index ee20a1bd62..7a84ad0e85 100644 --- a/samples/display/display.cpp +++ b/samples/display/display.cpp @@ -89,7 +89,7 @@ private: wxBookCtrl *m_book; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Client data class for the choice control containing the video modes @@ -132,7 +132,7 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Display_Quit, MyFrame::OnQuit) EVT_MENU(Display_FromPoint, MyFrame::OnFromPoint) EVT_MENU(Display_FullScreen, MyFrame::OnFullScreen) @@ -146,7 +146,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #endif // wxUSE_DISPLAY EVT_LEFT_UP(MyFrame::OnLeftClick) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/dll/my_dll.cpp b/samples/dll/my_dll.cpp index 5c23dd8634..490dc0aadb 100644 --- a/samples/dll/my_dll.cpp +++ b/samples/dll/my_dll.cpp @@ -51,7 +51,7 @@ public: void OnAbout(wxCommandEvent& event); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; @@ -77,9 +77,9 @@ private: // MyDllFrame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyDllFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyDllFrame, wxFrame) EVT_BUTTON(wxID_ABOUT, MyDllFrame::OnAbout) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyDllFrame::MyDllFrame(wxWindow *parent, const wxString& label) : wxFrame(parent, wxID_ANY, label) diff --git a/samples/dll/wx_exe.cpp b/samples/dll/wx_exe.cpp index 1a57e9836e..135f8dc5ef 100644 --- a/samples/dll/wx_exe.cpp +++ b/samples/dll/wx_exe.cpp @@ -51,7 +51,7 @@ public: void OnRunDLL(wxCommandEvent& event); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; @@ -71,9 +71,9 @@ public: // MainFrame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MainFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MainFrame, wxFrame) EVT_BUTTON(ID_RUN_DLL, MainFrame::OnRunDLL) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MainFrame::MainFrame() : wxFrame(NULL, wxID_ANY, "Main wx app", diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp index e54fca8733..ba826dfaac 100644 --- a/samples/dnd/dnd.cpp +++ b/samples/dnd/dnd.cpp @@ -151,7 +151,7 @@ public: private: wxBitmap m_bitmap; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; #if wxUSE_METAFILE @@ -187,7 +187,7 @@ public: private: wxMetafile m_metafile; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; #endif // wxUSE_METAFILE @@ -271,7 +271,7 @@ private: wxString m_strText; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -696,7 +696,7 @@ private: *m_textW, *m_textH; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -735,7 +735,7 @@ private: static DnDShapeFrame *ms_lastDropTarget; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -826,7 +826,7 @@ enum Button_Colour = 1001 }; -BEGIN_EVENT_TABLE(DnDFrame, wxFrame) +wxBEGIN_EVENT_TABLE(DnDFrame, wxFrame) EVT_MENU(Menu_Quit, DnDFrame::OnQuit) EVT_MENU(Menu_About, DnDFrame::OnAbout) EVT_MENU(Menu_Drag, DnDFrame::OnDrag) @@ -857,11 +857,11 @@ BEGIN_EVENT_TABLE(DnDFrame, wxFrame) EVT_RIGHT_DOWN( DnDFrame::OnRightDown) EVT_PAINT( DnDFrame::OnPaint) EVT_SIZE( DnDFrame::OnSize) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #if wxUSE_DRAG_AND_DROP -BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame) +wxBEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame) EVT_MENU(Menu_Shape_New, DnDShapeFrame::OnNewShape) EVT_MENU(Menu_Shape_Edit, DnDShapeFrame::OnEditShape) EVT_MENU(Menu_Shape_Clear, DnDShapeFrame::OnClearShape) @@ -875,22 +875,22 @@ BEGIN_EVENT_TABLE(DnDShapeFrame, wxFrame) EVT_LEFT_DOWN(DnDShapeFrame::OnDrag) EVT_PAINT(DnDShapeFrame::OnPaint) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(DnDShapeDialog, wxDialog) +wxBEGIN_EVENT_TABLE(DnDShapeDialog, wxDialog) EVT_BUTTON(Button_Colour, DnDShapeDialog::OnColour) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #endif // wxUSE_DRAG_AND_DROP -BEGIN_EVENT_TABLE(DnDCanvasBitmap, wxScrolledWindow) +wxBEGIN_EVENT_TABLE(DnDCanvasBitmap, wxScrolledWindow) EVT_PAINT(DnDCanvasBitmap::OnPaint) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #if wxUSE_METAFILE -BEGIN_EVENT_TABLE(DnDCanvasMetafile, wxScrolledWindow) +wxBEGIN_EVENT_TABLE(DnDCanvasMetafile, wxScrolledWindow) EVT_PAINT(DnDCanvasMetafile::OnPaint) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #endif // wxUSE_METAFILE #endif // wxUSE_DRAG_AND_DROP diff --git a/samples/docview/doc.h b/samples/docview/doc.h index 8f970cdd52..1c76aa89f5 100644 --- a/samples/docview/doc.h +++ b/samples/docview/doc.h @@ -99,7 +99,7 @@ private: DoodleSegments m_doodleSegments; - DECLARE_DYNAMIC_CLASS(DrawingDocument) + wxDECLARE_DYNAMIC_CLASS(DrawingDocument); }; @@ -179,7 +179,7 @@ protected: void OnTextChange(wxCommandEvent& event); wxDECLARE_NO_COPY_CLASS(wxTextDocument); - DECLARE_CLASS(wxTextDocument) + wxDECLARE_ABSTRACT_CLASS(wxTextDocument); }; // ---------------------------------------------------------------------------- @@ -193,7 +193,7 @@ public: virtual wxTextCtrl* GetTextCtrl() const; wxDECLARE_NO_COPY_CLASS(TextEditDocument); - DECLARE_DYNAMIC_CLASS(TextEditDocument) + wxDECLARE_DYNAMIC_CLASS(TextEditDocument); }; // ---------------------------------------------------------------------------- @@ -219,7 +219,7 @@ private: wxImage m_image; wxDECLARE_NO_COPY_CLASS(ImageDocument); - DECLARE_DYNAMIC_CLASS(ImageDocument) + wxDECLARE_DYNAMIC_CLASS(ImageDocument); }; // This is a child document of ImageDocument: this document doesn't diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp index d00bcf903a..d5438e6429 100644 --- a/samples/docview/docview.cpp +++ b/samples/docview/docview.cpp @@ -72,9 +72,9 @@ IMPLEMENT_APP(MyApp) -BEGIN_EVENT_TABLE(MyApp, wxApp) +wxBEGIN_EVENT_TABLE(MyApp, wxApp) EVT_MENU(wxID_ABOUT, MyApp::OnAbout) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyApp::MyApp() { diff --git a/samples/docview/docview.h b/samples/docview/docview.h index c694031b2b..60a7f6ab99 100644 --- a/samples/docview/docview.h +++ b/samples/docview/docview.h @@ -76,7 +76,7 @@ private: MyCanvas *m_canvas; wxMenu *m_menuEdit; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); wxDECLARE_NO_COPY_CLASS(MyApp); }; diff --git a/samples/docview/view.cpp b/samples/docview/view.cpp index 4a865407a4..9f20032069 100644 --- a/samples/docview/view.cpp +++ b/samples/docview/view.cpp @@ -34,9 +34,9 @@ IMPLEMENT_DYNAMIC_CLASS(DrawingView, wxView) -BEGIN_EVENT_TABLE(DrawingView, wxView) +wxBEGIN_EVENT_TABLE(DrawingView, wxView) EVT_MENU(wxID_CUT, DrawingView::OnCut) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // What to do when a view is created. Creates actual // windows for displaying the view. @@ -146,11 +146,11 @@ void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) ) IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView) -BEGIN_EVENT_TABLE(TextEditView, wxView) +wxBEGIN_EVENT_TABLE(TextEditView, wxView) EVT_MENU(wxID_COPY, TextEditView::OnCopy) EVT_MENU(wxID_PASTE, TextEditView::OnPaste) EVT_MENU(wxID_SELECTALL, TextEditView::OnSelectAll) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() bool TextEditView::OnCreate(wxDocument *doc, long flags) { @@ -198,9 +198,9 @@ bool TextEditView::OnClose(bool deleteWindow) // MyCanvas implementation // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) +wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Define a constructor for my canvas MyCanvas::MyCanvas(wxView *view, wxWindow *parent) diff --git a/samples/docview/view.h b/samples/docview/view.h index 9102144b7c..53e9baccc5 100644 --- a/samples/docview/view.h +++ b/samples/docview/view.h @@ -59,7 +59,7 @@ private: // the last mouse press position wxPoint m_lastMousePos; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // The view using MyCanvas to show its contents @@ -80,8 +80,8 @@ private: MyCanvas *m_canvas; - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(DrawingView) + wxDECLARE_EVENT_TABLE(); + wxDECLARE_DYNAMIC_CLASS(DrawingView); }; // ---------------------------------------------------------------------------- @@ -107,8 +107,8 @@ private: wxTextCtrl *m_text; - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(TextEditView) + wxDECLARE_EVENT_TABLE(); + wxDECLARE_DYNAMIC_CLASS(TextEditView); }; // ---------------------------------------------------------------------------- @@ -144,7 +144,7 @@ public: private: ImageCanvas* m_canvas; - DECLARE_DYNAMIC_CLASS(ImageView) + wxDECLARE_DYNAMIC_CLASS(ImageView); }; // ---------------------------------------------------------------------------- diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp index abba25c685..687d2b4f8d 100644 --- a/samples/dragimag/dragimag.cpp +++ b/samples/dragimag/dragimag.cpp @@ -48,11 +48,11 @@ IMPLEMENT_APP(MyApp) IMPLEMENT_CLASS(MyCanvas, wxScrolledWindow) -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) +wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_PAINT(MyCanvas::OnPaint) EVT_ERASE_BACKGROUND(MyCanvas::OnEraseBackground) EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) @@ -307,10 +307,10 @@ DragShape* MyCanvas::FindShape(const wxPoint& pt) const // MyFrame IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame ) -BEGIN_EVENT_TABLE(MyFrame,wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame,wxFrame) EVT_MENU (wxID_ABOUT, MyFrame::OnAbout) EVT_MENU (wxID_EXIT, MyFrame::OnQuit) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame() : wxFrame( (wxFrame *)NULL, wxID_ANY, wxT("wxDragImage sample"), @@ -353,9 +353,9 @@ void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) ) // MyApp //----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyApp, wxApp) +wxBEGIN_EVENT_TABLE(MyApp, wxApp) EVT_MENU(TEST_USE_SCREEN, MyApp::OnUseScreen) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyApp::MyApp() { diff --git a/samples/dragimag/dragimag.h b/samples/dragimag/dragimag.h index 391495d5a7..443f8ada65 100644 --- a/samples/dragimag/dragimag.h +++ b/samples/dragimag/dragimag.h @@ -34,8 +34,8 @@ public: private: MyCanvas* m_canvas; - DECLARE_DYNAMIC_CLASS(MyFrame) - DECLARE_EVENT_TABLE() + wxDECLARE_DYNAMIC_CLASS(MyFrame); + wxDECLARE_EVENT_TABLE(); }; // MyApp @@ -105,8 +105,8 @@ private: wxPoint m_dragStartPos; wxDragImage* m_dragImage; - DECLARE_CLASS(MyCanvas) - DECLARE_EVENT_TABLE() + wxDECLARE_ABSTRACT_CLASS(MyCanvas); + wxDECLARE_EVENT_TABLE(); }; diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp index 2d3c6c7316..b0715c08dc 100644 --- a/samples/drawing/drawing.cpp +++ b/samples/drawing/drawing.cpp @@ -129,7 +129,7 @@ public: private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // define a scrollable canvas for drawing onto @@ -195,7 +195,7 @@ private: #endif bool m_useBuffer; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -394,12 +394,12 @@ void MyApp::DeleteBitmaps() // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) +wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_PAINT (MyCanvas::OnPaint) EVT_MOTION (MyCanvas::OnMouseMove) EVT_LEFT_DOWN (MyCanvas::OnMouseDown) EVT_LEFT_UP (MyCanvas::OnMouseUp) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #include "smile.xpm" @@ -1737,7 +1737,7 @@ void MyCanvas::OnMouseUp(wxMouseEvent &event) // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU (File_Quit, MyFrame::OnQuit) EVT_MENU (File_About, MyFrame::OnAbout) EVT_MENU (File_Clip, MyFrame::OnClip) @@ -1751,7 +1751,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU_RANGE(MenuShow_First, MenuShow_Last, MyFrame::OnShow) EVT_MENU_RANGE(MenuOption_First, MenuOption_Last, MyFrame::OnOption) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // frame constructor MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp index 8b175cfb3b..3d14dd1a8f 100644 --- a/samples/erase/erase.cpp +++ b/samples/erase/erase.cpp @@ -108,7 +108,7 @@ private: bool m_eraseBgInPaint; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyFrame : public wxFrame @@ -137,7 +137,7 @@ private: MyCanvas *m_canvas; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class ControlWithTransparency : public wxWindow @@ -233,7 +233,7 @@ bool MyApp::OnInit() // main frame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Erase_Menu_UseBuffer, MyFrame::OnUseBuffer) EVT_MENU(Erase_Menu_UseBgBitmap, MyFrame::OnUseBgBitmap) EVT_MENU(Erase_Menu_EraseBgInPaint, MyFrame::OnEraseBgInPaint) @@ -246,7 +246,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_UPDATE_UI(Erase_Menu_UseBuffer, MyFrame::OnUpdateUIUseBuffer) EVT_UPDATE_UI_RANGE(Erase_Menu_BgStyleErase, Erase_Menu_BgStylePaint, MyFrame::OnUpdateUIChangeBgStyle) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // frame constructor MyFrame::MyFrame() @@ -329,10 +329,10 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) } -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) +wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_PAINT(MyCanvas::OnPaint) EVT_ERASE_BACKGROUND(MyCanvas::OnEraseBackground) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyCanvas::MyCanvas(wxFrame *parent) { diff --git a/samples/event/event.cpp b/samples/event/event.cpp index 861c2d2048..a78f6697f8 100644 --- a/samples/event/event.cpp +++ b/samples/event/event.cpp @@ -78,7 +78,7 @@ public: virtual int FilterEvent(wxEvent& event); private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Define a custom button used to highlight the events handling order @@ -112,7 +112,7 @@ private: event.Skip(); } - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; long MyEvtTestButton::BUTTON_ID = wxNewId(); @@ -182,7 +182,7 @@ private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Define a custom event handler @@ -203,7 +203,7 @@ public: private: unsigned m_level; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -231,19 +231,19 @@ enum // The event tables connect the wxWidgets events with the functions (event // handlers) which process them. -BEGIN_EVENT_TABLE(MyApp, wxApp) +wxBEGIN_EVENT_TABLE(MyApp, wxApp) // Add a static handler for button Click event in the app EVT_BUTTON(MyEvtTestButton::BUTTON_ID, MyApp::OnClickStaticHandlerApp) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(MyEvtTestButton, wxButton) +wxBEGIN_EVENT_TABLE(MyEvtTestButton, wxButton) // Add a static handler to this button itself for its own event EVT_BUTTON(BUTTON_ID, MyEvtTestButton::OnClickStaticHandler) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // This can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Event_Quit, MyFrame::OnQuit) EVT_MENU(Event_About, MyFrame::OnAbout) @@ -267,11 +267,11 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) // Add a static handler in the parent frame for button event EVT_BUTTON(MyEvtTestButton::BUTTON_ID, MyFrame::OnClickStaticHandlerFrame) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler) +wxBEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler) EVT_MENU(Event_Test, MyEvtHandler::OnTest) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/except/except.cpp b/samples/except/except.cpp index 4f9ea48dbf..9ca6aac701 100644 --- a/samples/except/except.cpp +++ b/samples/except/except.cpp @@ -140,7 +140,7 @@ protected: private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // A simple dialog which has only some buttons to throw exceptions @@ -155,7 +155,7 @@ public: void OnCrash(wxCommandEvent& event); private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // A trivial exception class @@ -209,7 +209,7 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Except_Quit, MyFrame::OnQuit) EVT_MENU(Except_About, MyFrame::OnAbout) EVT_MENU(Except_Dialog, MyFrame::OnDialog) @@ -226,13 +226,13 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #if wxUSE_THREADS EVT_MENU(Except_ShowAssertInThread, MyFrame::OnShowAssertInThread) #endif // wxUSE_THREADS -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(MyDialog, wxDialog) +wxBEGIN_EVENT_TABLE(MyDialog, wxDialog) EVT_BUTTON(Except_ThrowInt, MyDialog::OnThrowInt) EVT_BUTTON(Except_ThrowObject, MyDialog::OnThrowObject) EVT_BUTTON(Except_Crash, MyDialog::OnCrash) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp index 91df193390..df486b4b2c 100644 --- a/samples/exec/exec.cpp +++ b/samples/exec/exec.cpp @@ -189,7 +189,7 @@ private: wxTimer m_timerBg; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -243,7 +243,7 @@ private: *m_textIn, *m_textErr; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -351,7 +351,7 @@ static const wxChar *DIALOG_TITLE = wxT("Exec sample"); // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Exec_Quit, MyFrame::OnQuit) EVT_MENU(Exec_Kill, MyFrame::OnKill) EVT_MENU(Exec_ClearLog, MyFrame::OnClear) @@ -382,9 +382,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_TIMER(Exec_TimerIdle, MyFrame::OnIdleTimer) EVT_TIMER(Exec_TimerBg, MyFrame::OnBgTimer) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(MyPipeFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyPipeFrame, wxFrame) EVT_BUTTON(Exec_Btn_Send, MyPipeFrame::OnBtnSend) EVT_BUTTON(Exec_Btn_SendFile, MyPipeFrame::OnBtnSendFile) EVT_BUTTON(Exec_Btn_Get, MyPipeFrame::OnBtnGet) @@ -395,7 +395,7 @@ BEGIN_EVENT_TABLE(MyPipeFrame, wxFrame) EVT_CLOSE(MyPipeFrame::OnClose) EVT_END_PROCESS(wxID_ANY, MyPipeFrame::OnProcessTerm) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a @@ -732,13 +732,13 @@ private: wxCheckBox* m_useCWD; wxCheckBox* m_useEnv; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(ExecQueryDialog, wxDialog) +wxBEGIN_EVENT_TABLE(ExecQueryDialog, wxDialog) EVT_UPDATE_UI(TEXT_CWD, ExecQueryDialog::OnUpdateWorkingDirectoryUI) EVT_UPDATE_UI(TEXT_ENVIRONMENT, ExecQueryDialog::OnUpdateEnvironmentUI) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() ExecQueryDialog::ExecQueryDialog(const wxString& cmd) : wxDialog(NULL, wxID_ANY, DIALOG_TITLE, diff --git a/samples/flash/flash.cpp b/samples/flash/flash.cpp index cd856f58f3..a9c5ec83b6 100644 --- a/samples/flash/flash.cpp +++ b/samples/flash/flash.cpp @@ -185,7 +185,7 @@ private: *m_funcname, *m_funcarg; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); wxDECLARE_NO_COPY_CLASS(FlashFrame); }; @@ -193,7 +193,7 @@ private: // event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(FlashFrame, wxFrame) +wxBEGIN_EVENT_TABLE(FlashFrame, wxFrame) EVT_MENU(wxID_OPEN, FlashFrame::OnOpen) EVT_MENU(wxID_EXIT, FlashFrame::OnQuit) EVT_MENU(wxID_ABOUT, FlashFrame::OnAbout) @@ -210,7 +210,7 @@ BEGIN_EVENT_TABLE(FlashFrame, wxFrame) EVT_BUTTON(Flash_CallWithArg, FlashFrame::OnCallWithArg) EVT_ACTIVEX(wxID_ANY, FlashFrame::OnActiveXEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() IMPLEMENT_APP(FlashApp) diff --git a/samples/font/font.cpp b/samples/font/font.cpp index 7852c2f343..cc9476a95e 100644 --- a/samples/font/font.cpp +++ b/samples/font/font.cpp @@ -79,7 +79,7 @@ private: wxColour m_colour; wxFont m_font; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Define a new frame type: this is going to be our main frame @@ -151,7 +151,7 @@ protected: private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -216,7 +216,7 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Font_Quit, MyFrame::OnQuit) EVT_MENU(Font_TestTextValue, MyFrame::OnTestTextValue) EVT_MENU(Font_ViewMsg, MyFrame::OnViewMsg) @@ -257,7 +257,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Font_EnumFamilies, MyFrame::OnEnumerateFamilies) EVT_MENU(Font_EnumFixedFamilies, MyFrame::OnEnumerateFixedFamilies) EVT_MENU(Font_EnumEncodings, MyFrame::OnEnumerateEncodings) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a @@ -1001,9 +1001,9 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) // MyCanvas // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyCanvas, wxWindow) +wxBEGIN_EVENT_TABLE(MyCanvas, wxWindow) EVT_PAINT(MyCanvas::OnPaint) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyCanvas::MyCanvas( wxWindow *parent ) : wxWindow( parent, wxID_ANY ), diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp index 506b36812e..aeeefa1b3d 100644 --- a/samples/grid/griddemo.cpp +++ b/samples/grid/griddemo.cpp @@ -147,7 +147,7 @@ bool GridApp::OnInit() // GridFrame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE( GridFrame, wxFrame ) +wxBEGIN_EVENT_TABLE( GridFrame, wxFrame ) EVT_MENU( ID_TOGGLEROWLABELS, GridFrame::ToggleRowLabels ) EVT_MENU( ID_TOGGLECOLLABELS, GridFrame::ToggleColLabels ) EVT_MENU( ID_TOGGLEEDIT, GridFrame::ToggleEditing ) @@ -234,7 +234,7 @@ BEGIN_EVENT_TABLE( GridFrame, wxFrame ) EVT_GRID_EDITOR_SHOWN( GridFrame::OnEditorShown ) EVT_GRID_EDITOR_HIDDEN( GridFrame::OnEditorHidden ) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() GridFrame::GridFrame() @@ -2068,10 +2068,10 @@ private: bool m_shouldUpdateOrder; wxDECLARE_NO_COPY_CLASS(TabularGridFrame); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(TabularGridFrame, wxFrame) +wxBEGIN_EVENT_TABLE(TabularGridFrame, wxFrame) EVT_CHECKBOX(Id_Check_UseNativeHeader, TabularGridFrame::OnToggleUseNativeHeader) EVT_CHECKBOX(Id_Check_DrawNativeLabels, @@ -2094,7 +2094,7 @@ BEGIN_EVENT_TABLE(TabularGridFrame, wxFrame) EVT_GRID_COL_SIZE(TabularGridFrame::OnGridColSize) EVT_IDLE(TabularGridFrame::OnIdle) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() TabularGridFrame::TabularGridFrame() : wxFrame(NULL, wxID_ANY, "Tabular table") diff --git a/samples/grid/griddemo.h b/samples/grid/griddemo.h index 8ec319a597..ae8fc588d7 100644 --- a/samples/grid/griddemo.h +++ b/samples/grid/griddemo.h @@ -217,7 +217,7 @@ public: wxBitmap m_gridBitmap; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyGridCellRenderer : public wxGridCellStringRenderer diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp index 7f6835395c..e9072d1996 100644 --- a/samples/help/demo.cpp +++ b/samples/help/demo.cpp @@ -162,7 +162,7 @@ private: #endif // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // A custom modal dialog @@ -173,7 +173,7 @@ public: private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -232,7 +232,7 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(HelpDemo_Quit, MyFrame::OnQuit) EVT_MENU(HelpDemo_Help_Index, MyFrame::OnHelp) EVT_MENU(HelpDemo_Help_Classes, MyFrame::OnHelp) @@ -266,7 +266,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(HelpDemo_Help_KDE, MyFrame::OnHelp) EVT_MENU(HelpDemo_Help_GNOME, MyFrame::OnHelp) EVT_MENU(HelpDemo_Help_Netscape, MyFrame::OnHelp) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a @@ -674,8 +674,8 @@ void MyFrame::ShowHelp(int commandId, wxHelpControllerBase& helpController) // Demonstrates context-sensitive help // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyModalDialog, wxDialog) -END_EVENT_TABLE() +wxBEGIN_EVENT_TABLE(MyModalDialog, wxDialog) +wxEND_EVENT_TABLE() MyModalDialog::MyModalDialog(wxWindow *parent) : wxDialog(parent, wxID_ANY, wxString(wxT("Modal dialog"))) diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp index f6101d2648..3e393065ea 100644 --- a/samples/htlbox/htlbox.cpp +++ b/samples/htlbox/htlbox.cpp @@ -95,7 +95,7 @@ public: #endif wxDECLARE_NO_COPY_CLASS(MyHtmlListBox); - DECLARE_DYNAMIC_CLASS(MyHtmlListBox) + wxDECLARE_DYNAMIC_CLASS(MyHtmlListBox); }; @@ -146,7 +146,7 @@ private: wxHtmlListBox *m_hlbox; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyApp : public wxApp @@ -190,7 +190,7 @@ enum // event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(HtmlLbox_CustomBox, MyFrame::OnSimpleOrCustomBox) EVT_MENU(HtmlLbox_SimpleBox, MyFrame::OnSimpleOrCustomBox) EVT_MENU(HtmlLbox_Quit, MyFrame::OnQuit) @@ -222,7 +222,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_HTML_CELL_HOVER(wxID_ANY, MyFrame::OnHtmlCellHover) EVT_HTML_CELL_CLICKED(wxID_ANY, MyFrame::OnHtmlCellClicked) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() IMPLEMENT_APP(MyApp) diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp index 2021fcfadf..f9df08c4ad 100644 --- a/samples/html/about/about.cpp +++ b/samples/html/about/about.cpp @@ -62,7 +62,7 @@ public: private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -72,10 +72,10 @@ private: // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) EVT_MENU(wxID_EXIT, MyFrame::OnQuit) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp index 24f8d1d924..4d97f160d8 100644 --- a/samples/html/help/help.cpp +++ b/samples/html/help/help.cpp @@ -67,7 +67,7 @@ private: wxHtmlHelpController help; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -89,11 +89,11 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Minimal_Quit, MyFrame::OnQuit) EVT_MENU(Minimal_Help, MyFrame::OnHelp) EVT_CLOSE(MyFrame::OnClose) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/html/htmlctrl/htmlctrl.cpp b/samples/html/htmlctrl/htmlctrl.cpp index 5de9111380..58dec162ac 100644 --- a/samples/html/htmlctrl/htmlctrl.cpp +++ b/samples/html/htmlctrl/htmlctrl.cpp @@ -87,7 +87,7 @@ public: wxTextCtrl* urlText; private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -97,7 +97,7 @@ private: // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_BUTTON(ID_BACK, MyFrame::OnBackButton) EVT_BUTTON(ID_NEXT, MyFrame::OnNextButton) EVT_BUTTON(ID_STOP, MyFrame::OnStopButton) @@ -108,7 +108,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_WEBKIT_STATE_CHANGED(MyFrame::OnStateChanged) //EVT_MENU(Minimal_Quit, MyFrame::OnQuit) //EVT_MENU(Minimal_About, MyFrame::OnAbout) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp index 46cdadf4f2..38afac2352 100644 --- a/samples/html/printing/printing.cpp +++ b/samples/html/printing/printing.cpp @@ -76,7 +76,7 @@ private: wxString m_Name; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -105,7 +105,7 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Minimal_Quit, MyFrame::OnQuit) EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) EVT_MENU(Minimal_Print, MyFrame::OnPrint) @@ -115,7 +115,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Minimal_PrintSmall, MyFrame::OnPrintSmall) EVT_MENU(Minimal_PrintNormal, MyFrame::OnPrintNormal) EVT_MENU(Minimal_PrintHuge, MyFrame::OnPrintHuge) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp index 64498d7c2e..b9c6b9e9cf 100644 --- a/samples/html/test/test.cpp +++ b/samples/html/test/test.cpp @@ -73,7 +73,7 @@ private: bool m_drawCustomBg; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); wxDECLARE_NO_COPY_CLASS(MyHtmlWindow); }; @@ -103,7 +103,7 @@ private: wxHtmlProcessor *m_Processor; // Any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; @@ -143,7 +143,7 @@ enum // event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_EXIT, MyFrame::OnQuit) EVT_MENU(ID_PageOpen, MyFrame::OnPageOpen) EVT_MENU(ID_DefaultLocalBrowser, MyFrame::OnDefaultLocalBrowser) @@ -156,7 +156,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_HTML_LINK_CLICKED(wxID_ANY, MyFrame::OnHtmlLinkClicked) EVT_HTML_CELL_HOVER(wxID_ANY, MyFrame::OnHtmlCellHover) EVT_HTML_CELL_CLICKED(wxID_ANY, MyFrame::OnHtmlCellClicked) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() IMPLEMENT_APP(MyApp) @@ -377,12 +377,12 @@ wxHtmlOpeningStatus MyHtmlWindow::OnOpeningURL(wxHtmlURLType WXUNUSED(type), return wxHTML_OPEN; } -BEGIN_EVENT_TABLE(MyHtmlWindow, wxHtmlWindow) +wxBEGIN_EVENT_TABLE(MyHtmlWindow, wxHtmlWindow) #if wxUSE_CLIPBOARD EVT_TEXT_COPY(wxID_ANY, MyHtmlWindow::OnClipboardEvent) #endif // wxUSE_CLIPBOARD EVT_ERASE_BACKGROUND(MyHtmlWindow::OnEraseBgEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #if wxUSE_CLIPBOARD void MyHtmlWindow::OnClipboardEvent(wxClipboardTextEvent& WXUNUSED(event)) diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp index d89eb9835a..3aca027130 100644 --- a/samples/html/virtual/virtual.cpp +++ b/samples/html/virtual/virtual.cpp @@ -111,7 +111,7 @@ public: private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -137,11 +137,11 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Minimal_Quit, MyFrame::OnQuit) EVT_MENU(Minimal_Back, MyFrame::OnBack) EVT_MENU(Minimal_Forward, MyFrame::OnForward) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp index 04ff16c5f6..9262c5b5c2 100644 --- a/samples/html/widget/widget.cpp +++ b/samples/html/widget/widget.cpp @@ -104,7 +104,7 @@ public: private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -130,11 +130,11 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Minimal_Quit, MyFrame::OnQuit) EVT_MENU(Minimal_Back, MyFrame::OnBack) EVT_MENU(Minimal_Forward, MyFrame::OnForward) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp index 61ec1e556c..d613171ea3 100644 --- a/samples/html/zip/zip.cpp +++ b/samples/html/zip/zip.cpp @@ -60,7 +60,7 @@ public: private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -83,11 +83,11 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Minimal_Quit, MyFrame::OnQuit) EVT_MENU(Minimal_Back, MyFrame::OnBack) EVT_MENU(Minimal_Forward, MyFrame::OnForward) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/image/canvas.cpp b/samples/image/canvas.cpp index cf8433caaf..7fec98a21b 100644 --- a/samples/image/canvas.cpp +++ b/samples/image/canvas.cpp @@ -43,9 +43,9 @@ // MyCanvas //----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) +wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_PAINT(MyCanvas::OnPaint) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) diff --git a/samples/image/canvas.h b/samples/image/canvas.h index 7a0f027268..aa47522180 100644 --- a/samples/image/canvas.h +++ b/samples/image/canvas.h @@ -68,5 +68,5 @@ private: wxBitmap m_bmpSmileXpm; wxIcon m_iconSmileXpm; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 3c614c3229..fb3a4daf9d 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -104,8 +104,8 @@ private: static wxString LoadUserImage(wxImage& image); - DECLARE_DYNAMIC_CLASS(MyFrame) - DECLARE_EVENT_TABLE() + wxDECLARE_DYNAMIC_CLASS(MyFrame); + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -437,7 +437,7 @@ private: wxBitmap m_bitmap; double m_zoom; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; #ifdef wxHAVE_RAW_BITMAP @@ -574,7 +574,7 @@ private: wxBitmap m_bitmap; wxBitmap m_alphaBitmap; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; #endif // wxHAVE_RAW_BITMAP @@ -588,7 +588,7 @@ private: // MyImageFrame //----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyImageFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyImageFrame, wxFrame) EVT_ERASE_BACKGROUND(MyImageFrame::OnEraseBackground) EVT_PAINT(MyImageFrame::OnPaint) @@ -599,7 +599,7 @@ BEGIN_EVENT_TABLE(MyImageFrame, wxFrame) EVT_MENU(wxID_ZOOM_IN, MyImageFrame::OnZoom) EVT_MENU(wxID_ZOOM_OUT, MyImageFrame::OnZoom) EVT_MENU(wxID_ZOOM_100, MyImageFrame::OnZoom) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() //----------------------------------------------------------------------------- // MyRawBitmapFrame @@ -607,9 +607,9 @@ END_EVENT_TABLE() #ifdef wxHAVE_RAW_BITMAP -BEGIN_EVENT_TABLE(MyRawBitmapFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyRawBitmapFrame, wxFrame) EVT_PAINT(MyRawBitmapFrame::OnPaint) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #endif // wxHAVE_RAW_BITMAP @@ -629,7 +629,7 @@ enum }; IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame ) -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU (ID_ABOUT, MyFrame::OnAbout) EVT_MENU (ID_QUIT, MyFrame::OnQuit) EVT_MENU (ID_NEW, MyFrame::OnNewFrame) @@ -645,7 +645,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_COPY, MyFrame::OnCopy) EVT_MENU(wxID_PASTE, MyFrame::OnPaste) #endif // wxUSE_CLIPBOARD -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame() : wxFrame( (wxFrame *)NULL, wxID_ANY, wxT("wxImage sample"), diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp index 2567325036..39afb24bad 100644 --- a/samples/internat/internat.cpp +++ b/samples/internat/internat.cpp @@ -77,7 +77,7 @@ public: void OnTest3(wxCommandEvent& event); void OnTestMsgBox(wxCommandEvent& event); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); wxLocale& m_locale; }; @@ -154,7 +154,7 @@ wxCOMPILE_TIME_ASSERT( WXSIZEOF(langNames) == WXSIZEOF(langIds), // wxWidgets macros // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(INTERNAT_TEST, MyFrame::OnTestLocaleAvail) EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) EVT_MENU(wxID_EXIT, MyFrame::OnQuit) @@ -165,7 +165,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(INTERNAT_TEST_2, MyFrame::OnTest2) EVT_MENU(INTERNAT_TEST_3, MyFrame::OnTest3) EVT_MENU(INTERNAT_TEST_MSGBOX, MyFrame::OnTestMsgBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() IMPLEMENT_APP(MyApp) diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp index 7ed6920717..bb54389e1f 100644 --- a/samples/ipc/client.cpp +++ b/samples/ipc/client.cpp @@ -44,7 +44,7 @@ IMPLEMENT_APP(MyApp) -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_EXIT, MyFrame::OnExit) EVT_CLOSE( MyFrame::OnClose ) EVT_BUTTON( ID_START, MyFrame::OnStart ) @@ -57,7 +57,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_BUTTON( ID_POKE, MyFrame::OnPoke ) EVT_BUTTON( ID_EXECUTE, MyFrame::OnExecute ) EVT_BUTTON( ID_REQUEST, MyFrame::OnRequest ) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ---------------------------------------------------------------------------- // globals diff --git a/samples/ipc/client.h b/samples/ipc/client.h index b27570c2d4..04086ec9ef 100644 --- a/samples/ipc/client.h +++ b/samples/ipc/client.h @@ -75,7 +75,7 @@ protected: void OnRequest(wxCommandEvent& event); protected: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyConnection : public MyConnectionBase diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp index 5c34fdcb61..fa6b413e2a 100644 --- a/samples/ipc/server.cpp +++ b/samples/ipc/server.cpp @@ -45,14 +45,14 @@ IMPLEMENT_APP(MyApp) -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_CLOSE( MyFrame::OnClose ) EVT_BUTTON( ID_START, MyFrame::OnStart ) EVT_CHOICE( ID_SERVERNAME, MyFrame::OnServerName ) EVT_BUTTON( ID_DISCONNECT, MyFrame::OnDisconnect ) EVT_BUTTON( ID_ADVISE, MyFrame::OnAdvise ) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ diff --git a/samples/ipc/server.h b/samples/ipc/server.h index 4cf38233bf..b2371f1d29 100644 --- a/samples/ipc/server.h +++ b/samples/ipc/server.h @@ -59,7 +59,7 @@ protected: void OnDisconnect( wxCommandEvent &event ); void OnAdvise( wxCommandEvent &event ); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyConnection : public MyConnectionBase diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp index 9404c3d8b2..479dc7df87 100644 --- a/samples/joytest/joytest.cpp +++ b/samples/joytest/joytest.cpp @@ -97,9 +97,9 @@ bool MyApp::OnInit() return true; } -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) +wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_JOYSTICK_EVENTS(MyCanvas::OnJoystickEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Define a constructor for my canvas MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size): @@ -182,9 +182,9 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event) #endif // wxUSE_SOUND } -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(JOYTEST_QUIT, MyFrame::OnQuit) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style) diff --git a/samples/joytest/joytest.h b/samples/joytest/joytest.h index 8e2d6a9c0f..28ec6b8f4a 100644 --- a/samples/joytest/joytest.h +++ b/samples/joytest/joytest.h @@ -35,7 +35,7 @@ public: void OnJoystickEvent(wxJoystickEvent& event); wxJoystick* m_stick; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyFrame: public wxFrame diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp index af32931ba0..8f036ec00e 100644 --- a/samples/layout/layout.cpp +++ b/samples/layout/layout.cpp @@ -62,7 +62,7 @@ bool MyApp::OnInit() // MyFrame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(LAYOUT_ABOUT, MyFrame::OnAbout) EVT_MENU(LAYOUT_QUIT, MyFrame::OnQuit) @@ -73,7 +73,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(LAYOUT_TEST_SET_MINIMAL, MyFrame::TestSetMinimal) EVT_MENU(LAYOUT_TEST_NESTED, MyFrame::TestNested) EVT_MENU(LAYOUT_TEST_WRAP, MyFrame::TestWrap) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Define my frame constructor MyFrame::MyFrame() @@ -465,12 +465,12 @@ enum { }; -BEGIN_EVENT_TABLE(MyGridBagSizerFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyGridBagSizerFrame, wxFrame) EVT_BUTTON( GBS_HIDE_BTN, MyGridBagSizerFrame::OnHideBtn) EVT_BUTTON( GBS_SHOW_BTN, MyGridBagSizerFrame::OnShowBtn) EVT_BUTTON( GBS_MOVE_BTN1, MyGridBagSizerFrame::OnMoveBtn) EVT_BUTTON( GBS_MOVE_BTN2, MyGridBagSizerFrame::OnMoveBtn) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyGridBagSizerFrame::MyGridBagSizerFrame(wxFrame* parent) @@ -582,10 +582,10 @@ enum { ID_SET_BIG }; -BEGIN_EVENT_TABLE(MySimpleSizerFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MySimpleSizerFrame, wxFrame) EVT_MENU( ID_SET_SMALL, MySimpleSizerFrame::OnSetSmallSize) EVT_MENU( ID_SET_BIG, MySimpleSizerFrame::OnSetBigSize) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MySimpleSizerFrame::MySimpleSizerFrame(wxFrame* parent) : wxFrame(parent, wxID_ANY, "Simple Sizer Test Frame") @@ -674,10 +674,10 @@ MyNestedSizerFrame::MyNestedSizerFrame(wxFrame* parent) // MyWrapSizerFrame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyWrapSizerFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyWrapSizerFrame, wxFrame) EVT_MENU(wxID_ADD, MyWrapSizerFrame::OnAddCheckbox) EVT_MENU(wxID_REMOVE, MyWrapSizerFrame::OnRemoveCheckbox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyWrapSizerFrame::MyWrapSizerFrame(wxFrame* parent) : wxFrame(parent, wxID_ANY, "Wrap Sizer Test Frame", diff --git a/samples/layout/layout.h b/samples/layout/layout.h index 7e80805ef6..0ab6fd585a 100644 --- a/samples/layout/layout.h +++ b/samples/layout/layout.h @@ -34,7 +34,7 @@ public: void OnQuit(wxCommandEvent& event); private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // a frame showing the box sizer proportions @@ -93,7 +93,7 @@ private: wxButton* m_moveBtn2; wxGBPosition m_lastPos; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; @@ -109,7 +109,7 @@ public: private: wxTextCtrl *m_target; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; @@ -142,7 +142,7 @@ private: wxWindow* m_checkboxParent; wxSizer* m_wrapSizer; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // controls and menu constants diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp index d25886e703..26e1a3f264 100644 --- a/samples/listctrl/listtest.cpp +++ b/samples/listctrl/listtest.cpp @@ -108,7 +108,7 @@ bool MyApp::OnInit() // MyFrame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_SIZE(MyFrame::OnSize) EVT_MENU(LIST_QUIT, MyFrame::OnQuit) @@ -161,7 +161,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_UPDATE_UI(LIST_TOGGLE_MULTI_SEL, MyFrame::OnUpdateToggleMultiSel) EVT_UPDATE_UI(LIST_TOGGLE_HEADER, MyFrame::OnUpdateToggleHeader) EVT_UPDATE_UI(LIST_ROW_LINES, MyFrame::OnUpdateRowLines) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // My frame constructor MyFrame::MyFrame(const wxChar *title) @@ -923,7 +923,7 @@ void MyFrame::OnDeleteAll(wxCommandEvent& WXUNUSED(event)) // MyListCtrl // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl) +wxBEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl) EVT_LIST_BEGIN_DRAG(LIST_CTRL, MyListCtrl::OnBeginDrag) EVT_LIST_BEGIN_RDRAG(LIST_CTRL, MyListCtrl::OnBeginRDrag) EVT_LIST_BEGIN_LABEL_EDIT(LIST_CTRL, MyListCtrl::OnBeginLabelEdit) @@ -950,7 +950,7 @@ BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl) EVT_CHAR(MyListCtrl::OnChar) EVT_RIGHT_DOWN(MyListCtrl::OnRightClick) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() void MyListCtrl::OnCacheHint(wxListEvent& event) { diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h index a5cdcc1679..7b18f0247f 100644 --- a/samples/listctrl/listtest.h +++ b/samples/listctrl/listtest.h @@ -90,7 +90,7 @@ private: wxDECLARE_NO_COPY_CLASS(MyListCtrl); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Define a new frame type @@ -186,7 +186,7 @@ private: wxDECLARE_NO_COPY_CLASS(MyFrame); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp index bf4c9006e1..ee5acc77e7 100644 --- a/samples/mdi/mdi.cpp +++ b/samples/mdi/mdi.cpp @@ -62,7 +62,7 @@ IMPLEMENT_APP(MyApp) // event tables // --------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame) EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) EVT_MENU(wxID_NEW, MyFrame::OnNewWindow) EVT_MENU(MDI_FULLSCREEN, MyFrame::OnFullScreen) @@ -71,12 +71,12 @@ BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame) EVT_MENU(wxID_CLOSE_ALL, MyFrame::OnCloseAll) EVT_CLOSE(MyFrame::OnClose) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Note that wxID_NEW and wxID_ABOUT commands get passed // to the parent window for processing, so no need to // duplicate event handlers here. -BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame) +wxBEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame) EVT_MENU(wxID_CLOSE, MyChild::OnClose) EVT_MENU(MDI_REFRESH, MyChild::OnRefresh) EVT_MENU(MDI_CHANGE_TITLE, MyChild::OnChangeTitle) @@ -92,15 +92,15 @@ BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame) EVT_MOVE(MyChild::OnMove) EVT_CLOSE(MyChild::OnCloseWindow) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) +wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_MOUSE_EVENTS(MyCanvas::OnEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(MyChild::EventHandler, wxEvtHandler) +wxBEGIN_EVENT_TABLE(MyChild::EventHandler, wxEvtHandler) EVT_MENU(MDI_REFRESH, MyChild::EventHandler::OnRefresh) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // =========================================================================== // implementation diff --git a/samples/mdi/mdi.h b/samples/mdi/mdi.h index abfdb6a3d2..0ec0dd02c9 100644 --- a/samples/mdi/mdi.h +++ b/samples/mdi/mdi.h @@ -34,7 +34,7 @@ private: bool m_dirty; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Define a new frame @@ -60,7 +60,7 @@ private: wxTextCtrl *m_textWindow; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyChild : public wxMDIChildFrame @@ -108,12 +108,12 @@ private: const unsigned m_numChild; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); wxDECLARE_NO_COPY_CLASS(EventHandler); }; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // menu items ids diff --git a/samples/mediaplayer/mediaplayer.cpp b/samples/mediaplayer/mediaplayer.cpp index 640bb152c7..477c2b9878 100644 --- a/samples/mediaplayer/mediaplayer.cpp +++ b/samples/mediaplayer/mediaplayer.cpp @@ -589,9 +589,9 @@ wxMediaPlayerFrame::wxMediaPlayerFrame(const wxString& title) // class you want to use for events, such as wxMediaPlayerFrame. // // Then after your class declaration you put - // BEGIN_EVENT_TABLE(wxMediaPlayerFrame, wxFrame) + // wxBEGIN_EVENT_TABLE(wxMediaPlayerFrame, wxFrame) // EVT_XXX(XXX)... - // END_EVENT_TABLE() + // wxEND_EVENT_TABLE() // // Where wxMediaPlayerFrame is the class with the DECLARE_MESSAGE_MAP // in it. EVT_XXX(XXX) are each of your handlers, such diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp index 38ef83050b..0d29a56db2 100644 --- a/samples/memcheck/memcheck.cpp +++ b/samples/memcheck/memcheck.cpp @@ -120,9 +120,9 @@ bool MyApp::OnInit(void) return true; } -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_EXIT, MyFrame::OnQuit) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // My frame constructor MyFrame::MyFrame(wxFrame *parent): diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp index 192dea405b..ca54c27b8e 100644 --- a/samples/menu/menu.cpp +++ b/samples/menu/menu.cpp @@ -182,7 +182,7 @@ private: // the previous log target wxLog *m_logOld; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyDialog : public wxDialog @@ -227,7 +227,7 @@ private: wxTextCtrl *m_textctrl; #endif - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // A small helper class which intercepts all menu events and logs them @@ -246,7 +246,7 @@ public: private: MyFrame *m_frame; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -323,7 +323,7 @@ enum // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Menu_File_Quit, MyFrame::OnQuit) #if USE_LOG_WINDOW EVT_MENU(Menu_File_ClearLog, MyFrame::OnClearLog) @@ -387,9 +387,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU_HIGHLIGHT_ALL(MyFrame::OnMenuHighlight) EVT_SIZE(MyFrame::OnSize) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(MyDialog, wxDialog) +wxBEGIN_EVENT_TABLE(MyDialog, wxDialog) #if USE_CONTEXT_MENU EVT_CONTEXT_MENU(MyDialog::OnContextMenu) #else @@ -398,11 +398,11 @@ BEGIN_EVENT_TABLE(MyDialog, wxDialog) EVT_MENU_OPEN(MyDialog::OnMenuOpen) EVT_MENU_CLOSE(MyDialog::OnMenuClose) EVT_MENU_HIGHLIGHT_ALL(MyDialog::OnMenuHighlight) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler) +wxBEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler) EVT_MENU(wxID_ANY, MyEvtHandler::OnMenuEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp index fde6f0237c..b3001cbef7 100644 --- a/samples/mfc/mfctest.cpp +++ b/samples/mfc/mfctest.cpp @@ -108,7 +108,7 @@ public: MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size); void OnPaint(wxPaintEvent& event); void OnMouseEvent(wxMouseEvent& event); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyChild: public wxFrame @@ -123,7 +123,7 @@ public: MyCanvas *canvas; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ID for the menu quit command @@ -320,10 +320,10 @@ wxFrame *MyApp::CreateFrame() return subframe; } -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) +wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_PAINT(MyCanvas::OnPaint) EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Define a constructor for my canvas MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size) @@ -370,11 +370,11 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event) s_ypos = pos.y; } -BEGIN_EVENT_TABLE(MyChild, wxFrame) +wxBEGIN_EVENT_TABLE(MyChild, wxFrame) EVT_MENU(HELLO_QUIT, MyChild::OnQuit) EVT_MENU(HELLO_NEW, MyChild::OnNew) EVT_ACTIVATE(MyChild::OnActivate) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyChild::MyChild(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, const long style) : wxFrame(frame, -1, title, pos, size, style) diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp index a78e462908..135595c9fb 100644 --- a/samples/minimal/minimal.cpp +++ b/samples/minimal/minimal.cpp @@ -70,7 +70,7 @@ public: private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -96,10 +96,10 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Minimal_Quit, MyFrame::OnQuit) EVT_MENU(Minimal_About, MyFrame::OnAbout) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp index f6a4a3cd56..147d1f43ed 100644 --- a/samples/nativdlg/nativdlg.cpp +++ b/samples/nativdlg/nativdlg.cpp @@ -69,10 +69,10 @@ bool MyApp::OnInit(void) return true; } -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(RESOURCE_QUIT, MyFrame::OnQuit) EVT_MENU(RESOURCE_TEST1, MyFrame::OnTest1) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Define my frame constructor MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size): @@ -101,10 +101,10 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) #endif } -BEGIN_EVENT_TABLE(MyDialog, wxDialog) +wxBEGIN_EVENT_TABLE(MyDialog, wxDialog) EVT_BUTTON(wxID_OK, MyDialog::OnOk) EVT_BUTTON(wxID_CANCEL, MyDialog::OnCancel) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() void MyDialog::OnOk(wxCommandEvent& WXUNUSED(event)) diff --git a/samples/nativdlg/nativdlg.h b/samples/nativdlg/nativdlg.h index 4b9f0781da..b0f47bbb91 100644 --- a/samples/nativdlg/nativdlg.h +++ b/samples/nativdlg/nativdlg.h @@ -24,7 +24,7 @@ class MyFrame: public wxFrame void OnQuit(wxCommandEvent& event); void OnTest1(wxCommandEvent& event); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyDialog : public wxDialog @@ -33,7 +33,7 @@ class MyDialog : public wxDialog void OnOk(wxCommandEvent& event); void OnCancel(wxCommandEvent& event); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; #define RESOURCE_QUIT 4 diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp index ad4fd199df..14e05fee44 100644 --- a/samples/notebook/notebook.cpp +++ b/samples/notebook/notebook.cpp @@ -221,7 +221,7 @@ wxPanel *CreatePage(wxBookCtrlBase *parent, const wxString&pageName) // MyFrame //----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) // File menu EVT_MENU_RANGE(ID_BOOK_NOTEBOOK, ID_BOOK_MAX, MyFrame::OnType) EVT_MENU_RANGE(ID_ORIENT_DEFAULT, ID_ORIENT_MAX, MyFrame::OnOrient) @@ -279,7 +279,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) // Update title in idle time EVT_IDLE(MyFrame::OnIdle) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame() : wxFrame(NULL, wxID_ANY, wxString(wxT("wxWidgets book controls sample"))) diff --git a/samples/notebook/notebook.h b/samples/notebook/notebook.h index 649c7f161f..daed799740 100644 --- a/samples/notebook/notebook.h +++ b/samples/notebook/notebook.h @@ -133,7 +133,7 @@ private: wxImageList *m_imageList; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; enum ID_COMMANDS diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp index 726e12be75..1c2a2ba0e3 100644 --- a/samples/oleauto/oleauto.cpp +++ b/samples/oleauto/oleauto.cpp @@ -74,7 +74,7 @@ public: private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -100,11 +100,11 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(OleAuto_Quit, MyFrame::OnQuit) EVT_MENU(OleAuto_About, MyFrame::OnAbout) EVT_MENU(OleAuto_Test, MyFrame::OnTest) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp index b077760502..a716c35a81 100644 --- a/samples/opengl/cube/cube.cpp +++ b/samples/opengl/cube/cube.cpp @@ -306,11 +306,11 @@ TestGLContext& MyApp::GetContext(wxGLCanvas *canvas, bool useStereo) // TestGLCanvas // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas) +wxBEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas) EVT_PAINT(TestGLCanvas::OnPaint) EVT_KEY_DOWN(TestGLCanvas::OnKeyDown) EVT_TIMER(SpinTimer, TestGLCanvas::OnSpinTimer) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() TestGLCanvas::TestGLCanvas(wxWindow *parent, int *attribList) // With perspective OpenGL graphics, the wxFULL_REPAINT_ON_RESIZE style @@ -452,11 +452,11 @@ wxString glGetwxString(GLenum name) // MyFrame: main application window // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_NEW, MyFrame::OnNewWindow) EVT_MENU(NEW_STEREO_WINDOW, MyFrame::OnNewStereoWindow) EVT_MENU(wxID_CLOSE, MyFrame::OnClose) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame( bool stereoWindow ) : wxFrame(NULL, wxID_ANY, wxT("wxWidgets OpenGL Cube Sample")) diff --git a/samples/opengl/cube/cube.h b/samples/opengl/cube/cube.h index ac70d65584..1694d61d12 100644 --- a/samples/opengl/cube/cube.h +++ b/samples/opengl/cube/cube.h @@ -59,7 +59,7 @@ private: void OnNewWindow(wxCommandEvent& event); void OnNewStereoWindow(wxCommandEvent& event); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class TestGLCanvas : public wxGLCanvas @@ -81,7 +81,7 @@ private: bool m_useStereo, m_stereoWarningAlreadyDisplayed; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; enum diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp index fb9c1ac9cf..7acc4a7f27 100644 --- a/samples/opengl/isosurf/isosurf.cpp +++ b/samples/opengl/isosurf/isosurf.cpp @@ -87,9 +87,9 @@ bool MyApp::OnCmdLineParsed(wxCmdLineParser& parser) // MyFrame //--------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_EXIT, MyFrame::OnExit) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, long style) @@ -161,12 +161,12 @@ void MyFrame::OnExit( wxCommandEvent& WXUNUSED(event) ) // TestGLCanvas //--------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas) +wxBEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas) EVT_SIZE(TestGLCanvas::OnSize) EVT_PAINT(TestGLCanvas::OnPaint) EVT_CHAR(TestGLCanvas::OnChar) EVT_MOUSE_EVENTS(TestGLCanvas::OnMouseEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id, diff --git a/samples/opengl/isosurf/isosurf.h b/samples/opengl/isosurf/isosurf.h index aeb6c8e712..0eccfde50f 100644 --- a/samples/opengl/isosurf/isosurf.h +++ b/samples/opengl/isosurf/isosurf.h @@ -70,7 +70,7 @@ private: GLfloat m_yrot; wxDECLARE_NO_COPY_CLASS(TestGLCanvas); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; @@ -91,7 +91,7 @@ public: private : void OnExit(wxCommandEvent& event); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; diff --git a/samples/opengl/penguin/penguin.cpp b/samples/opengl/penguin/penguin.cpp index f95b9d076e..24524817b8 100644 --- a/samples/opengl/penguin/penguin.cpp +++ b/samples/opengl/penguin/penguin.cpp @@ -66,11 +66,11 @@ IMPLEMENT_APP(MyApp) // MyFrame // --------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_OPEN, MyFrame::OnMenuFileOpen) EVT_MENU(wxID_EXIT, MyFrame::OnMenuFileExit) EVT_MENU(wxID_HELP, MyFrame::OnMenuHelpAbout) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // MyFrame constructor MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, @@ -133,12 +133,12 @@ void MyFrame::OnMenuHelpAbout( wxCommandEvent& WXUNUSED(event) ) // TestGLCanvas // --------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas) +wxBEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas) EVT_SIZE(TestGLCanvas::OnSize) EVT_PAINT(TestGLCanvas::OnPaint) EVT_ERASE_BACKGROUND(TestGLCanvas::OnEraseBackground) EVT_MOUSE_EVENTS(TestGLCanvas::OnMouse) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id, diff --git a/samples/opengl/penguin/penguin.h b/samples/opengl/penguin/penguin.h index 6c8240e9f1..00ee7edffd 100644 --- a/samples/opengl/penguin/penguin.h +++ b/samples/opengl/penguin/penguin.h @@ -69,7 +69,7 @@ public: private: TestGLCanvas *m_canvas; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; @@ -100,7 +100,7 @@ private: DXFRenderer m_renderer; wxDECLARE_NO_COPY_CLASS(TestGLCanvas); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; #endif // #ifndef _WX_PENGUIN_H_ diff --git a/samples/ownerdrw/ownerdrw.cpp b/samples/ownerdrw/ownerdrw.cpp index a9dd840fd3..b943b105b7 100644 --- a/samples/ownerdrw/ownerdrw.cpp +++ b/samples/ownerdrw/ownerdrw.cpp @@ -51,7 +51,7 @@ public: void OnListboxDblClick (wxCommandEvent& event); bool OnClose () { return true; } - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); private: void InitMenu(); @@ -74,7 +74,7 @@ enum Control_Listbox, Control_Listbox2 }; -BEGIN_EVENT_TABLE(OwnerDrawnFrame, wxFrame) +wxBEGIN_EVENT_TABLE(OwnerDrawnFrame, wxFrame) EVT_MENU(Menu_Toggle, OwnerDrawnFrame::OnMenuToggle) EVT_MENU(Menu_About, OwnerDrawnFrame::OnAbout) EVT_MENU(Menu_Quit, OwnerDrawnFrame::OnQuit) @@ -82,7 +82,7 @@ BEGIN_EVENT_TABLE(OwnerDrawnFrame, wxFrame) EVT_CHECKLISTBOX(Control_Listbox, OwnerDrawnFrame::OnCheckboxToggle) EVT_COMMAND(Control_Listbox, wxEVT_LISTBOX_DCLICK, OwnerDrawnFrame::OnListboxDblClick) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() IMPLEMENT_APP(OwnerDrawnApp) diff --git a/samples/popup/popup.cpp b/samples/popup/popup.cpp index fdf102314a..9584b5e617 100644 --- a/samples/popup/popup.cpp +++ b/samples/popup/popup.cpp @@ -89,8 +89,8 @@ private: void OnSpinCtrl( wxSpinEvent& event ); private: - DECLARE_CLASS(SimpleTransientPopup) - DECLARE_EVENT_TABLE() + wxDECLARE_ABSTRACT_CLASS(SimpleTransientPopup); + wxDECLARE_EVENT_TABLE(); }; //---------------------------------------------------------------------------- @@ -98,14 +98,14 @@ private: //---------------------------------------------------------------------------- IMPLEMENT_CLASS(SimpleTransientPopup,wxPopupTransientWindow) -BEGIN_EVENT_TABLE(SimpleTransientPopup,wxPopupTransientWindow) +wxBEGIN_EVENT_TABLE(SimpleTransientPopup,wxPopupTransientWindow) EVT_MOUSE_EVENTS( SimpleTransientPopup::OnMouse ) EVT_SIZE( SimpleTransientPopup::OnSize ) EVT_SET_FOCUS( SimpleTransientPopup::OnSetFocus ) EVT_KILL_FOCUS( SimpleTransientPopup::OnKillFocus ) EVT_BUTTON( Minimal_PopupButton, SimpleTransientPopup::OnButton ) EVT_SPINCTRL( Minimal_PopupSpinctrl, SimpleTransientPopup::OnSpinCtrl ) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() SimpleTransientPopup::SimpleTransientPopup( wxWindow *parent, bool scrolled ) :wxPopupTransientWindow( parent ) @@ -267,7 +267,7 @@ public: private: SimpleTransientPopup *m_simplePopup; SimpleTransientPopup *m_scrolledPopup; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyFrame : public wxFrame @@ -288,7 +288,7 @@ private: SimpleTransientPopup *m_scrolledPopup; wxTextCtrl *m_logWin; wxLog *m_logOld; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyApp : public wxApp @@ -329,14 +329,14 @@ bool MyApp::OnInit() // main frame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Minimal_Quit, MyFrame::OnQuit) EVT_MENU(Minimal_About, MyFrame::OnAbout) EVT_MENU(Minimal_TestDialog, MyFrame::OnTestDialog) EVT_ACTIVATE(MyFrame::OnActivate) EVT_BUTTON(Minimal_StartSimplePopup, MyFrame::OnStartSimplePopup) EVT_BUTTON(Minimal_StartScrolledPopup, MyFrame::OnStartScrolledPopup) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame(const wxString& title) : wxFrame(NULL, wxID_ANY, title, wxDefaultPosition, wxSize(500,300)) @@ -454,10 +454,10 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) // test dialog // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyDialog, wxDialog) +wxBEGIN_EVENT_TABLE(MyDialog, wxDialog) EVT_BUTTON(Minimal_StartSimplePopup, MyDialog::OnStartSimplePopup) EVT_BUTTON(Minimal_StartScrolledPopup, MyDialog::OnStartScrolledPopup) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyDialog::MyDialog(const wxString& title) :wxDialog(NULL, wxID_ANY, title, wxPoint(50,50), wxSize(400,300)) diff --git a/samples/power/power.cpp b/samples/power/power.cpp index 23a95b30e3..9bdad67250 100644 --- a/samples/power/power.cpp +++ b/samples/power/power.cpp @@ -167,10 +167,10 @@ private: wxLog *m_logOld; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_IDLE(MyFrame::OnIdle) #ifdef wxHAS_POWER_EVENTS @@ -179,7 +179,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_POWER_SUSPEND_CANCEL(MyFrame::OnSuspendCancel) EVT_POWER_RESUME(MyFrame::OnResume) #endif // wxHAS_POWER_EVENTS -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ---------------------------------------------------------------------------- // main application class diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp index 9a40b10078..1e29cfa4d3 100644 --- a/samples/printing/printing.cpp +++ b/samples/printing/printing.cpp @@ -270,7 +270,7 @@ void MyApp::Draw(wxDC&dc) // MyFrame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_EXIT, MyFrame::OnExit) EVT_MENU(wxID_PRINT, MyFrame::OnPrint) EVT_MENU(wxID_PREVIEW, MyFrame::OnPrintPreview) @@ -290,7 +290,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU_RANGE(WXPRINT_FRAME_MODAL_APP, WXPRINT_FRAME_MODAL_NON, MyFrame::OnPreviewFrameModalityKind) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame(wxFrame *frame, const wxString&title, const wxPoint&pos, const wxSize&size) : wxFrame(frame, wxID_ANY, title, pos, size) @@ -502,9 +502,9 @@ void MyFrame::OnPreviewFrameModalityKind(wxCommandEvent& event) // MyCanvas // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) +wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) // EVT_PAINT(MyCanvas::OnPaint) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyCanvas::MyCanvas(wxFrame *frame, const wxPoint&pos, const wxSize&size, long style) : wxScrolledWindow(frame, wxID_ANY, pos, size, style) diff --git a/samples/printing/printing.h b/samples/printing/printing.h index 00e6f64dcf..099d5b8e0d 100644 --- a/samples/printing/printing.h +++ b/samples/printing/printing.h @@ -66,7 +66,7 @@ private: MyCanvas* m_canvas; wxPreviewFrameModalityKind m_previewModality; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Define a new white canvas @@ -79,7 +79,7 @@ public: virtual void OnDraw(wxDC& dc); private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Defines a new printout class to print our document diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp index 5b0d08e0f3..3f183024f2 100644 --- a/samples/propgrid/propgrid.cpp +++ b/samples/propgrid/propgrid.cpp @@ -80,7 +80,7 @@ class wxSampleMultiButtonEditor : public wxPGTextCtrlEditor { - DECLARE_DYNAMIC_CLASS(wxSampleMultiButtonEditor) + wxDECLARE_DYNAMIC_CLASS(wxSampleMultiButtonEditor); public: wxSampleMultiButtonEditor() {} virtual ~wxSampleMultiButtonEditor() {} @@ -441,7 +441,7 @@ enum // Event table // ----------------------------------------------------------------------- -BEGIN_EVENT_TABLE(FormMain, wxFrame) +wxBEGIN_EVENT_TABLE(FormMain, wxFrame) EVT_IDLE(FormMain::OnIdle) EVT_MOVE(FormMain::OnMove) EVT_SIZE(FormMain::OnResize) @@ -557,7 +557,7 @@ BEGIN_EVENT_TABLE(FormMain, wxFrame) EVT_CONTEXT_MENU( FormMain::OnContextMenu ) EVT_BUTTON(ID_SHOWPOPUP, FormMain::OnShowPopup) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ----------------------------------------------------------------------- @@ -1768,16 +1768,16 @@ protected: void OnPageChange( wxPropertyGridEvent& event ); private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(wxMyPropertyGridPage, wxPropertyGridPage) +wxBEGIN_EVENT_TABLE(wxMyPropertyGridPage, wxPropertyGridPage) EVT_PG_SELECTED( wxID_ANY, wxMyPropertyGridPage::OnPropertySelect ) EVT_PG_CHANGING( wxID_ANY, wxMyPropertyGridPage::OnPropertyChanging ) EVT_PG_CHANGED( wxID_ANY, wxMyPropertyGridPage::OnPropertyChange ) EVT_PG_PAGE_CHANGED( wxID_ANY, wxMyPropertyGridPage::OnPageChange ) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() void wxMyPropertyGridPage::OnPropertySelect( wxPropertyGridEvent& WXUNUSED(event) ) @@ -1817,12 +1817,12 @@ public: event.Skip(); } private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(wxPGKeyHandler,wxEvtHandler) +wxBEGIN_EVENT_TABLE(wxPGKeyHandler,wxEvtHandler) EVT_KEY_DOWN( wxPGKeyHandler::OnKeyEvent ) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ----------------------------------------------------------------------- @@ -3263,15 +3263,15 @@ struct PropertyGridPopup : wxPopupWindow SetSize(pos.x, pos.y, size.x, size.y); } - DECLARE_CLASS(PropertyGridPopup) - DECLARE_EVENT_TABLE() + wxDECLARE_ABSTRACT_CLASS(PropertyGridPopup); + wxDECLARE_EVENT_TABLE(); }; IMPLEMENT_CLASS(PropertyGridPopup, wxPopupWindow) -BEGIN_EVENT_TABLE(PropertyGridPopup, wxPopupWindow) +wxBEGIN_EVENT_TABLE(PropertyGridPopup, wxPopupWindow) EVT_PG_ITEM_COLLAPSED(ID_POPUPGRID, PropertyGridPopup::OnCollapse) EVT_PG_ITEM_EXPANDED(ID_POPUPGRID, PropertyGridPopup::OnExpand) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() void FormMain::OnShowPopup(wxCommandEvent& WXUNUSED(event)) diff --git a/samples/propgrid/propgrid.h b/samples/propgrid/propgrid.h index 0d39094b2e..4ab3f45235 100644 --- a/samples/propgrid/propgrid.h +++ b/samples/propgrid/propgrid.h @@ -260,7 +260,7 @@ public: bool RunTests( bool fullTest, bool interactive = false ); private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ----------------------------------------------------------------------- diff --git a/samples/propgrid/propgrid_minimal.cpp b/samples/propgrid/propgrid_minimal.cpp index d8e40999b1..8b0ac7779f 100644 --- a/samples/propgrid/propgrid_minimal.cpp +++ b/samples/propgrid/propgrid_minimal.cpp @@ -23,14 +23,14 @@ public: private: wxPropertyGrid* m_pg; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_HIGHEST+1, MyFrame::OnAction) EVT_PG_CHANGED( -1, MyFrame::OnPropertyGridChange ) EVT_PG_CHANGING( -1, MyFrame::OnPropertyGridChanging ) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame(wxWindow* parent) : wxFrame(parent, wxID_ANY, wxT("PropertyGrid Test")) diff --git a/samples/propgrid/sampleprops.cpp b/samples/propgrid/sampleprops.cpp index 20778a9673..49240cf6ee 100644 --- a/samples/propgrid/sampleprops.cpp +++ b/samples/propgrid/sampleprops.cpp @@ -365,7 +365,7 @@ protected: virtual void ArraySwap( size_t first, size_t second ); private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxArrayDoubleEditorDialog) + wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxArrayDoubleEditorDialog); }; IMPLEMENT_DYNAMIC_CLASS(wxArrayDoubleEditorDialog, wxPGArrayEditorDialog) diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp index 04990e58e4..6ec2856e30 100644 --- a/samples/regtest/regtest.cpp +++ b/samples/regtest/regtest.cpp @@ -174,7 +174,7 @@ public: void AddStdKeys(); private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; #endif // #if DO_REGTEST @@ -210,7 +210,7 @@ public: void OnViewChange (wxCommandEvent& event); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); private: @@ -251,7 +251,7 @@ enum // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(RegFrame, wxFrame) +wxBEGIN_EVENT_TABLE(RegFrame, wxFrame) EVT_MENU(Menu_Test, RegFrame::OnTest) EVT_MENU(Menu_About, RegFrame::OnAbout) EVT_MENU(Menu_Quit, RegFrame::OnQuit) @@ -268,11 +268,11 @@ BEGIN_EVENT_TABLE(RegFrame, wxFrame) EVT_MENU(Menu_ViewDefault, RegFrame::OnViewChange) EVT_MENU(Menu_View32, RegFrame::OnViewChange) EVT_MENU(Menu_View64, RegFrame::OnViewChange) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #if DO_REGTEST -BEGIN_EVENT_TABLE(RegTreeCtrl, wxTreeCtrl) +wxBEGIN_EVENT_TABLE(RegTreeCtrl, wxTreeCtrl) EVT_TREE_DELETE_ITEM (Ctrl_RegTree, RegTreeCtrl::OnDeleteItem) EVT_TREE_ITEM_EXPANDING (Ctrl_RegTree, RegTreeCtrl::OnItemExpanding) EVT_TREE_ITEM_COLLAPSING(Ctrl_RegTree, RegTreeCtrl::OnItemExpanding) @@ -288,7 +288,7 @@ BEGIN_EVENT_TABLE(RegTreeCtrl, wxTreeCtrl) EVT_CHAR (RegTreeCtrl::OnChar) EVT_RIGHT_DOWN(RegTreeCtrl::OnRightClick) EVT_IDLE (RegTreeCtrl::OnIdle) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #endif diff --git a/samples/render/render.cpp b/samples/render/render.cpp index 1986e54b21..515917289c 100644 --- a/samples/render/render.cpp +++ b/samples/render/render.cpp @@ -149,7 +149,7 @@ private: class MyPanel *m_panel; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // a very simple class just to have something to draw on @@ -274,12 +274,12 @@ private: bool m_useIcon, m_useBitmap; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(MyPanel, wxPanel) +wxBEGIN_EVENT_TABLE(MyPanel, wxPanel) EVT_PAINT(MyPanel::OnPaint) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ---------------------------------------------------------------------------- // constants @@ -324,7 +324,7 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Render_DrawDisabled, MyFrame::OnDrawDisabled) EVT_MENU(Render_DrawFocused, MyFrame::OnDrawFocused) EVT_MENU(Render_DrawPressed, MyFrame::OnDrawPressed) @@ -345,7 +345,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Render_Quit, MyFrame::OnQuit) EVT_MENU(Render_About, MyFrame::OnAbout) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/ribbon/ribbondemo.cpp b/samples/ribbon/ribbondemo.cpp index 44f8c2cb92..4821a7e1eb 100644 --- a/samples/ribbon/ribbondemo.cpp +++ b/samples/ribbon/ribbondemo.cpp @@ -169,7 +169,7 @@ protected: bool m_bChecked; wxString m_new_text; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // -- implementations -- @@ -185,7 +185,7 @@ bool MyApp::OnInit() return true; } -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_RIBBONBUTTONBAR_CLICKED(ID_ENABLE, MyFrame::OnEnable) EVT_RIBBONBUTTONBAR_CLICKED(ID_DISABLE, MyFrame::OnDisable) EVT_RIBBONBUTTONBAR_CLICKED(ID_DISABLED, MyFrame::OnDisabled) @@ -244,7 +244,7 @@ EVT_RIBBONBUTTONBAR_CLICKED(ID_SHOW_PAGES, MyFrame::OnShowPages) EVT_RIBBONBAR_TOGGLED(wxID_ANY, MyFrame::OnRibbonBarToggled) EVT_RIBBONBAR_HELP_CLICK(wxID_ANY, MyFrame::OnRibbonBarHelpClicked) EVT_SIZE(MyFrame::OnSizeEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #include "align_center.xpm" #include "align_left.xpm" diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp index 3609e3c3fc..0758d49e25 100644 --- a/samples/richtext/richtext.cpp +++ b/samples/richtext/richtext.cpp @@ -321,7 +321,7 @@ protected: private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); MyRichTextCtrl* m_richTextCtrl; }; @@ -404,7 +404,7 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(ID_Quit, MyFrame::OnQuit) EVT_MENU(ID_About, MyFrame::OnAbout) @@ -488,7 +488,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(ID_SET_FONT_SCALE, MyFrame::OnSetFontScale) EVT_MENU(ID_SET_DIMENSION_SCALE, MyFrame::OnSetDimensionScale) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/sashtest/sashtest.cpp b/samples/sashtest/sashtest.cpp index 125e672243..beba94ec8f 100644 --- a/samples/sashtest/sashtest.cpp +++ b/samples/sashtest/sashtest.cpp @@ -81,14 +81,14 @@ bool MyApp::OnInit(void) return true; } -BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame) EVT_MENU(SASHTEST_ABOUT, MyFrame::OnAbout) EVT_MENU(SASHTEST_NEW_WINDOW, MyFrame::OnNewWindow) EVT_SIZE(MyFrame::OnSize) EVT_MENU(SASHTEST_QUIT, MyFrame::OnQuit) EVT_MENU(SASHTEST_TOGGLE_WINDOW, MyFrame::OnToggleWindow) EVT_SASH_DRAGGED_RANGE(ID_WINDOW_TOP, ID_WINDOW_BOTTOM, MyFrame::OnSashDrag) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Define my frame constructor @@ -276,9 +276,9 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event)) subframe->Show(true); } -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) +wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_MOUSE_EVENTS(MyCanvas::OnEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Define a constructor for my canvas MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size) @@ -346,9 +346,9 @@ void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event)) // to the parent window for processing, so no need to // duplicate event handlers here. -BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame) +wxBEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame) EVT_MENU(SASHTEST_CHILD_QUIT, MyChild::OnQuit) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style): diff --git a/samples/sashtest/sashtest.h b/samples/sashtest/sashtest.h index fdb1085881..eca5f45f51 100644 --- a/samples/sashtest/sashtest.h +++ b/samples/sashtest/sashtest.h @@ -24,7 +24,7 @@ class MyCanvas: public wxScrolledWindow virtual void OnDraw(wxDC& dc); void OnEvent(wxMouseEvent& event); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Define a new frame diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp index a24dc49351..0792c1b0c1 100644 --- a/samples/scroll/scroll.cpp +++ b/samples/scroll/scroll.cpp @@ -106,7 +106,7 @@ private: wxButton *m_button; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyCanvasFrame : public wxFrame @@ -588,7 +588,7 @@ private: wxFont m_font; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyAutoFrame : public wxFrame @@ -629,7 +629,7 @@ private: MyScrolledWindowBase *m_win1, *m_win2; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -659,7 +659,7 @@ const wxWindowIDRef ID_QUERYPOS = wxWindow::NewControlId(); const wxWindowIDRef ID_NEWBUTTON = wxWindow::NewControlId(); -BEGIN_EVENT_TABLE(MyCanvas, wxScrolled) +wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolled) EVT_PAINT( MyCanvas::OnPaint) EVT_RIGHT_DOWN( MyCanvas::OnMouseRightDown) EVT_MOUSEWHEEL( MyCanvas::OnMouseWheel) @@ -668,7 +668,7 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolled) EVT_BUTTON( ID_DELBUTTON, MyCanvas::OnDeleteButton) EVT_BUTTON( ID_MOVEBUTTON, MyCanvas::OnMoveButton) EVT_BUTTON( ID_SCROLLWIN, MyCanvas::OnScrollWin) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyCanvas::MyCanvas(wxWindow *parent) : wxScrolled(parent, wxID_ANY, @@ -840,7 +840,7 @@ const wxWindowID Scroll_Test_Auto = wxWindow::NewControlId(); const wxWindowID Scroll_TglBtn_Sync = wxWindow::NewControlId(); const wxWindowID Scroll_Radio_ShowScrollbar = wxWindow::NewControlId(); -BEGIN_EVENT_TABLE(MyFrame,wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame,wxFrame) EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) EVT_MENU(wxID_EXIT, MyFrame::OnQuit) @@ -852,7 +852,7 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame) EVT_TOGGLEBUTTON(Scroll_TglBtn_Sync, MyFrame::OnToggleSync) EVT_RADIOBOX(Scroll_Radio_ShowScrollbar, MyFrame::OnScrollbarVisibility) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame() : wxFrame(NULL, wxID_ANY, "wxWidgets scroll sample") @@ -1045,13 +1045,13 @@ void MyScrolledWindowSmart::OnDraw(wxDC& dc) // MyAutoScrollingWindow // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyAutoScrollingWindow, wxScrolled) +wxBEGIN_EVENT_TABLE(MyAutoScrollingWindow, wxScrolled) EVT_LEFT_DOWN(MyAutoScrollingWindow::OnMouseLeftDown) EVT_LEFT_UP(MyAutoScrollingWindow::OnMouseLeftUp) EVT_MOTION(MyAutoScrollingWindow::OnMouseMove) EVT_MOUSE_CAPTURE_LOST(MyAutoScrollingWindow::OnMouseCaptureLost) EVT_SCROLLWIN(MyAutoScrollingWindow::OnScroll) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyAutoScrollingWindow::MyAutoScrollingWindow(wxWindow* parent) : wxScrolled(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, diff --git a/samples/shaped/shaped.cpp b/samples/shaped/shaped.cpp index cc357408ed..e794df20ec 100644 --- a/samples/shaped/shaped.cpp +++ b/samples/shaped/shaped.cpp @@ -93,7 +93,7 @@ private: void OnShowEffect(wxCommandEvent& event); void OnExit(wxCommandEvent& event); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Define a new frame type: this is going to the frame showing the @@ -128,7 +128,7 @@ private: wxPoint m_delta; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Define a new frame type: this is going to the frame showing the @@ -156,7 +156,7 @@ private: State m_currentState; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class EffectFrame : public wxFrame @@ -250,12 +250,12 @@ bool MyApp::OnInit() // main frame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MainFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MainFrame, wxFrame) EVT_MENU(Show_Shaped, MainFrame::OnShowShaped) EVT_MENU(Show_Transparent, MainFrame::OnShowTransparent) EVT_MENU_RANGE(Show_Effect_First, Show_Effect_Last, MainFrame::OnShowEffect) EVT_MENU(wxID_EXIT, MainFrame::OnExit) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MainFrame::MainFrame() : wxFrame(NULL, wxID_ANY, "wxWidgets Shaped Sample", @@ -370,14 +370,14 @@ void MainFrame::OnExit(wxCommandEvent& WXUNUSED(event)) // shaped frame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(ShapedFrame, wxFrame) +wxBEGIN_EVENT_TABLE(ShapedFrame, wxFrame) EVT_LEFT_DCLICK(ShapedFrame::OnDoubleClick) EVT_LEFT_DOWN(ShapedFrame::OnLeftDown) EVT_LEFT_UP(ShapedFrame::OnLeftUp) EVT_MOTION(ShapedFrame::OnMouseMove) EVT_RIGHT_UP(ShapedFrame::OnExit) EVT_PAINT(ShapedFrame::OnPaint) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // frame constructor @@ -476,10 +476,10 @@ void ShapedFrame::OnPaint(wxPaintEvent& WXUNUSED(evt)) // see-through frame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(SeeThroughFrame, wxFrame) +wxBEGIN_EVENT_TABLE(SeeThroughFrame, wxFrame) EVT_LEFT_DCLICK(SeeThroughFrame::OnDoubleClick) EVT_PAINT(SeeThroughFrame::OnPaint) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() SeeThroughFrame::SeeThroughFrame() : wxFrame(NULL, wxID_ANY, "Transparency test: double click here", diff --git a/samples/sockets/baseclient.cpp b/samples/sockets/baseclient.cpp index 35b249c2b4..32191ab99f 100644 --- a/samples/sockets/baseclient.cpp +++ b/samples/sockets/baseclient.cpp @@ -71,7 +71,7 @@ WX_DECLARE_LIST(ThreadWorker, TList); WX_DECLARE_LIST(EventWorker, EList); class Client : public wxApp { - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); public: void RemoveEventWorker(EventWorker* p_worker); private: @@ -140,7 +140,7 @@ private: class EventWorker : public wxEvtHandler { - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); public: EventWorker(const wxString& p_host, char* p_buf, int p_size); void Run(); @@ -504,10 +504,10 @@ Client::OnTimerEvent(wxTimerEvent&) { dumpStatistics(); } -BEGIN_EVENT_TABLE(Client,wxEvtHandler) +wxBEGIN_EVENT_TABLE(Client,wxEvtHandler) EVT_WORKER(Client::OnWorkerEvent) EVT_TIMER(wxID_ANY,Client::OnTimerEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() @@ -646,9 +646,9 @@ EventWorker::~EventWorker() { delete [] m_inbuf; } -BEGIN_EVENT_TABLE(EventWorker,wxEvtHandler) +wxBEGIN_EVENT_TABLE(EventWorker,wxEvtHandler) EVT_SOCKET(wxID_ANY,EventWorker::OnSocketEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() ThreadWorker::ThreadWorker(const wxString& p_host, char* p_buf, int p_size) diff --git a/samples/sockets/baseserver.cpp b/samples/sockets/baseserver.cpp index 67e5ebc495..31c5032537 100644 --- a/samples/sockets/baseserver.cpp +++ b/samples/sockets/baseserver.cpp @@ -100,7 +100,7 @@ WX_DECLARE_LIST(EventWorker, EList); //and list of two type worker classes that serve clients class Server : public wxApp { - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); public: Server() : m_maxConnections(-1) {} ~Server() {} @@ -197,7 +197,7 @@ private: void DoWrite(); void DoRead(); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; /******************* Implementation ******************/ @@ -473,11 +473,11 @@ void Server::OnTimerEvent(wxTimerEvent&) } -BEGIN_EVENT_TABLE(Server,wxEvtHandler) +wxBEGIN_EVENT_TABLE(Server,wxEvtHandler) EVT_SOCKET(wxID_ANY,Server::OnSocketEvent) EVT_WORKER(Server::OnWorkerEvent) EVT_TIMER(wxID_ANY,Server::OnTimerEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() ThreadWorker::ThreadWorker(wxSocketBase* pSocket) : wxThread(wxTHREAD_JOINABLE) @@ -759,6 +759,6 @@ void EventWorker::DoWrite() while (!m_socket->Error()); } -BEGIN_EVENT_TABLE(EventWorker,wxEvtHandler) +wxBEGIN_EVENT_TABLE(EventWorker,wxEvtHandler) EVT_SOCKET(wxID_ANY,EventWorker::OnSocketEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp index 23ccaafab3..e0bd39e16e 100644 --- a/samples/sockets/client.cpp +++ b/samples/sockets/client.cpp @@ -101,7 +101,7 @@ private: bool m_busy; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // simple helper class to log start and end of each test @@ -153,7 +153,7 @@ enum // event tables and other macros for wxWidgets // -------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(CLIENT_QUIT, MyFrame::OnQuit) EVT_MENU(CLIENT_ABOUT, MyFrame::OnAbout) EVT_MENU(CLIENT_OPEN, MyFrame::OnOpenConnection) @@ -169,7 +169,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(CLIENT_TESTURL, MyFrame::OnTestURL) #endif EVT_SOCKET(SOCKET_ID, MyFrame::OnSocketEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() IMPLEMENT_APP(MyApp) diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp index 1f6835a0ae..01da9af76a 100644 --- a/samples/sockets/server.cpp +++ b/samples/sockets/server.cpp @@ -90,7 +90,7 @@ private: int m_numClients; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // simple helper class to log start and end of each test @@ -133,14 +133,14 @@ enum // event tables and other macros for wxWidgets // -------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(SERVER_QUIT, MyFrame::OnQuit) EVT_MENU(SERVER_ABOUT, MyFrame::OnAbout) EVT_MENU(SERVER_UDPTEST, MyFrame::OnUDPTest) EVT_MENU(SERVER_WAITFORACCEPT, MyFrame::OnWaitForAccept) EVT_SOCKET(SERVER_ID, MyFrame::OnServerEvent) EVT_SOCKET(SOCKET_ID, MyFrame::OnSocketEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() IMPLEMENT_APP(MyApp) diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp index 4d48d4d0d4..de18ca59cf 100644 --- a/samples/sound/sound.cpp +++ b/samples/sound/sound.cpp @@ -92,7 +92,7 @@ private: wxTextCtrl* m_tc; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -127,7 +127,7 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Sound_SelectFile, MyFrame::OnSelectFile) #ifdef __WXMSW__ EVT_MENU(Sound_SelectResource, MyFrame::OnSelectResource) @@ -141,7 +141,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Sound_PlayLoop, MyFrame::OnPlayLoop) EVT_MENU(Sound_Stop, MyFrame::OnStop) EVT_MENU(Sound_PlayBell, MyFrame::OnPlayBell) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/splash/splash.cpp b/samples/splash/splash.cpp index 2df96524b3..690b6b4720 100644 --- a/samples/splash/splash.cpp +++ b/samples/splash/splash.cpp @@ -79,7 +79,7 @@ public: private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -99,10 +99,10 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_EXIT, MyFrame::OnQuit) EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp index 4177990a17..a839705273 100644 --- a/samples/splitter/splitter.cpp +++ b/samples/splitter/splitter.cpp @@ -115,7 +115,7 @@ private: wxSplitterWindow* m_splitter; wxWindow *m_replacewindow; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); wxDECLARE_NO_COPY_CLASS(MyFrame); }; @@ -133,7 +133,7 @@ public: private: wxFrame *m_frame; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); wxDECLARE_NO_COPY_CLASS(MySplitterWindow); }; @@ -178,7 +178,7 @@ bool MyApp::OnInit() // MyFrame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(SPLIT_VERTICAL, MyFrame::OnSplitVertical) EVT_MENU(SPLIT_HORIZONTAL, MyFrame::OnSplitHorizontal) EVT_MENU(SPLIT_UNSPLIT, MyFrame::OnUnsplit) @@ -197,7 +197,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_UPDATE_UI(SPLIT_HORIZONTAL, MyFrame::OnUpdateUIHorizontal) EVT_UPDATE_UI(SPLIT_UNSPLIT, MyFrame::OnUpdateUIUnsplit) EVT_UPDATE_UI(SPLIT_INVISIBLE, MyFrame::OnUpdateUIInvisible) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // My frame constructor MyFrame::MyFrame() @@ -473,14 +473,14 @@ void MyFrame::OnUpdateUIInvisible(wxUpdateUIEvent& event) // MySplitterWindow // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MySplitterWindow, wxSplitterWindow) +wxBEGIN_EVENT_TABLE(MySplitterWindow, wxSplitterWindow) EVT_SPLITTER_SASH_POS_CHANGED(wxID_ANY, MySplitterWindow::OnPositionChanged) EVT_SPLITTER_SASH_POS_CHANGING(wxID_ANY, MySplitterWindow::OnPositionChanging) EVT_SPLITTER_DCLICK(wxID_ANY, MySplitterWindow::OnDClick) EVT_SPLITTER_UNSPLIT(wxID_ANY, MySplitterWindow::OnUnsplitEvent) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MySplitterWindow::MySplitterWindow(wxFrame *parent) : wxSplitterWindow(parent, wxID_ANY, diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp index ec12792ad7..6f75819420 100644 --- a/samples/statbar/statbar.cpp +++ b/samples/statbar/statbar.cpp @@ -125,7 +125,7 @@ private: #endif wxStaticBitmap *m_statbmp; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Define a new frame type: this is going to be our main frame @@ -180,7 +180,7 @@ private: int m_field; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // Our about dialog ith its status bar @@ -237,9 +237,9 @@ static const int BITMAP_SIZE_Y = 15; // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. #ifdef USE_MDI_PARENT_FRAME -BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame) #else -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) #endif EVT_MENU(StatusBar_Quit, MyFrame::OnQuit) EVT_MENU(StatusBar_SetFields, MyFrame::OnSetStatusFields) @@ -272,9 +272,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) MyFrame::OnUpdateSetPaneStyle) EVT_UPDATE_UI_RANGE(StatusBar_SetStyleSizeGrip, StatusBar_SetStyleShowTips, MyFrame::OnUpdateSetStyle) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(MyStatusBar, wxStatusBar) +wxBEGIN_EVENT_TABLE(MyStatusBar, wxStatusBar) EVT_SIZE(MyStatusBar::OnSize) #if wxUSE_CHECKBOX EVT_CHECKBOX(StatusBar_Checkbox, MyStatusBar::OnToggleClock) @@ -283,7 +283,7 @@ BEGIN_EVENT_TABLE(MyStatusBar, wxStatusBar) EVT_TIMER(wxID_ANY, MyStatusBar::OnTimer) #endif EVT_IDLE(MyStatusBar::OnIdle) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/stc/edit.cpp b/samples/stc/edit.cpp index d3b4349f08..f44c63f696 100644 --- a/samples/stc/edit.cpp +++ b/samples/stc/edit.cpp @@ -60,7 +60,7 @@ const int ANNOTATION_STYLE = wxSTC_STYLE_LASTPREDEFINED + 1; // Edit //---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE (Edit, wxStyledTextCtrl) +wxBEGIN_EVENT_TABLE (Edit, wxStyledTextCtrl) // common EVT_SIZE ( Edit::OnSize) // edit @@ -114,7 +114,7 @@ BEGIN_EVENT_TABLE (Edit, wxStyledTextCtrl) EVT_STC_KEY( wxID_ANY , Edit::OnKey ) EVT_KEY_DOWN( Edit::OnKeyDown ) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() Edit::Edit (wxWindow *parent, wxWindowID id, const wxPoint &pos, diff --git a/samples/stc/edit.h b/samples/stc/edit.h index 926fe3c8df..a472cdb881 100644 --- a/samples/stc/edit.h +++ b/samples/stc/edit.h @@ -134,7 +134,7 @@ private: int m_FoldingMargin; int m_DividerID; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; //---------------------------------------------------------------------------- diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp index b42bda52d8..27d111da83 100644 --- a/samples/stc/stctest.cpp +++ b/samples/stc/stctest.cpp @@ -104,7 +104,7 @@ private: wxFrame* MinimalEditor(); protected: void OnMinimalEditor(wxCommandEvent&); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // created dynamically by wxWidgets @@ -159,7 +159,7 @@ private: // print preview position and size wxRect DeterminePrintSize (); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; //---------------------------------------------------------------------------- @@ -182,7 +182,7 @@ private: // timer wxTimer *m_timer; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; @@ -193,9 +193,9 @@ private: IMPLEMENT_APP (App) -BEGIN_EVENT_TABLE(App, wxApp) +wxBEGIN_EVENT_TABLE(App, wxApp) EVT_MENU(myID_WINDOW_MINIMAL, App::OnMinimalEditor) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() //---------------------------------------------------------------------------- // App @@ -247,7 +247,7 @@ int App::OnExit () { // AppFrame //---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE (AppFrame, wxFrame) +wxBEGIN_EVENT_TABLE (AppFrame, wxFrame) // common EVT_CLOSE ( AppFrame::OnClose) // file @@ -276,7 +276,7 @@ BEGIN_EVENT_TABLE (AppFrame, wxFrame) AppFrame::OnEdit) // help EVT_MENU (wxID_ABOUT, AppFrame::OnAbout) -END_EVENT_TABLE () +wxEND_EVENT_TABLE () AppFrame::AppFrame (const wxString &title) : wxFrame ((wxFrame *)NULL, wxID_ANY, title, wxDefaultPosition, wxSize(750,550), @@ -596,9 +596,9 @@ wxRect AppFrame::DeterminePrintSize () { // AppAbout //---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE (AppAbout, wxDialog) +wxBEGIN_EVENT_TABLE (AppAbout, wxDialog) EVT_TIMER (myID_ABOUTTIMER, AppAbout::OnTimerEvent) -END_EVENT_TABLE () +wxEND_EVENT_TABLE () AppAbout::AppAbout (wxWindow *parent, int milliseconds, @@ -750,13 +750,13 @@ public: protected: void OnMarginClick(wxStyledTextEvent&); void OnText(wxStyledTextEvent&); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(MinimalEditor, wxStyledTextCtrl) +wxBEGIN_EVENT_TABLE(MinimalEditor, wxStyledTextCtrl) EVT_STC_MARGINCLICK(wxID_ANY, MinimalEditor::OnMarginClick) EVT_STC_CHANGE(wxID_ANY, MinimalEditor::OnText) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() void MinimalEditor::OnMarginClick(wxStyledTextEvent &event) { diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp index c19be16039..185b975782 100644 --- a/samples/svg/svgtest.cpp +++ b/samples/svg/svgtest.cpp @@ -74,7 +74,7 @@ public: private: unsigned int m_nWinCreated; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyChild: public wxMDIChildFrame @@ -97,7 +97,7 @@ private: MyCanvas *m_canvas; MyFrame *m_frame; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyCanvas : public wxScrolledWindow @@ -110,7 +110,7 @@ private: int m_index; MyChild* m_child; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // --------------------------------------------------------------------------- @@ -132,14 +132,14 @@ enum // event tables // --------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame) EVT_MENU(MDI_ABOUT, MyFrame::OnAbout) EVT_MENU(MDI_NEW_WINDOW, MyFrame::OnNewWindow) EVT_MENU(MDI_QUIT, MyFrame::OnQuit) EVT_MENU (MDI_SAVE, MyFrame::FileSavePicture) EVT_SIZE(MyFrame::OnSize) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // =========================================================================== // implementation @@ -312,8 +312,8 @@ void MyFrame::FileSavePicture (wxCommandEvent & WXUNUSED(event) ) // MyCanvas // --------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) -END_EVENT_TABLE() +wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) +wxEND_EVENT_TABLE() // Define a constructor for my canvas MyCanvas::MyCanvas(MyChild *parent, const wxPoint& pos, const wxSize& size) @@ -613,9 +613,9 @@ void MyCanvas::OnDraw(wxDC& dc) // Note that MDI_NEW_WINDOW and MDI_ABOUT commands get passed // to the parent window for processing, so no need to // duplicate event handlers here. -BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame) +wxBEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame) EVT_MENU(MDI_CHILD_QUIT, MyChild::OnQuit) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, diff --git a/samples/taborder/taborder.cpp b/samples/taborder/taborder.cpp index da546fe8e3..9783e7404e 100644 --- a/samples/taborder/taborder.cpp +++ b/samples/taborder/taborder.cpp @@ -110,7 +110,7 @@ private: wxPanel *m_panel; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // and the panel taking up MyFrame client area @@ -183,7 +183,7 @@ bool MyApp::OnInit() // MyFrame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(TabOrder_Quit, MyFrame::OnQuit) EVT_MENU(TabOrder_About, MyFrame::OnAbout) @@ -191,7 +191,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(TabOrder_TabBackward, MyFrame::OnTabBackward) EVT_IDLE(MyFrame::OnIdle) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame() : wxFrame(NULL, wxID_ANY, wxT("TabOrder wxWidgets Sample"), diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp index 91f8cd8afc..8a3195a5af 100644 --- a/samples/taskbar/tbtest.cpp +++ b/samples/taskbar/tbtest.cpp @@ -82,12 +82,12 @@ bool MyApp::OnInit() // MyDialog implementation // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyDialog, wxDialog) +wxBEGIN_EVENT_TABLE(MyDialog, wxDialog) EVT_BUTTON(wxID_ABOUT, MyDialog::OnAbout) EVT_BUTTON(wxID_OK, MyDialog::OnOK) EVT_BUTTON(wxID_EXIT, MyDialog::OnExit) EVT_CLOSE(MyDialog::OnCloseWindow) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyDialog::MyDialog(const wxString& title) @@ -201,7 +201,7 @@ enum }; -BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon) +wxBEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon) EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore) EVT_MENU(PU_EXIT, MyTaskBarIcon::OnMenuExit) EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon) @@ -210,7 +210,7 @@ BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon) EVT_TASKBAR_LEFT_DCLICK (MyTaskBarIcon::OnLeftButtonDClick) EVT_MENU(PU_SUB1, MyTaskBarIcon::OnMenuSub) EVT_MENU(PU_SUB2, MyTaskBarIcon::OnMenuSub) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& ) { diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h index 1d93a8df25..f0589fd662 100644 --- a/samples/taskbar/tbtest.h +++ b/samples/taskbar/tbtest.h @@ -28,7 +28,7 @@ public: void OnMenuSub(wxCommandEvent&); virtual wxMenu *CreatePopupMenu(); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; @@ -56,5 +56,5 @@ protected: MyTaskBarIcon *m_dockIcon; #endif - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; diff --git a/samples/text/text.cpp b/samples/text/text.cpp index e0e5ede53b..8bfdab9c3b 100644 --- a/samples/text/text.cpp +++ b/samples/text/text.cpp @@ -103,7 +103,7 @@ private: bool m_hasCapture; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyPanel: public wxPanel @@ -352,7 +352,7 @@ private: MyPanel *m_panel; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; /* @@ -383,7 +383,7 @@ private: wxTextCtrl *m_textCtrl; long m_currentPosition; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; //---------------------------------------------------------------------- @@ -559,7 +559,7 @@ bool MyApp::OnInit() // MyTextCtrl //---------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl) +wxBEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl) EVT_KEY_DOWN(MyTextCtrl::OnKeyDown) EVT_KEY_UP(MyTextCtrl::OnKeyUp) EVT_CHAR(MyTextCtrl::OnChar) @@ -576,7 +576,7 @@ BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl) EVT_SET_FOCUS(MyTextCtrl::OnSetFocus) EVT_KILL_FOCUS(MyTextCtrl::OnKillFocus) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() bool MyTextCtrl::ms_logKey = false; bool MyTextCtrl::ms_logChar = false; @@ -1368,7 +1368,7 @@ void MyPanel::DoSelectText() // MyFrame //---------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(TEXT_QUIT, MyFrame::OnQuit) EVT_MENU(TEXT_ABOUT, MyFrame::OnAbout) EVT_MENU(TEXT_SAVE, MyFrame::OnFileSave) @@ -1423,7 +1423,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(TEXT_CHANGE, MyFrame::OnChangeText) EVT_IDLE(MyFrame::OnIdle) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h) : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h) ) @@ -1609,7 +1609,7 @@ enum RICHTEXT_TAB_STOPS }; -BEGIN_EVENT_TABLE(RichTextFrame, wxFrame) +wxBEGIN_EVENT_TABLE(RichTextFrame, wxFrame) EVT_IDLE(RichTextFrame::OnIdle) EVT_MENU(RICHTEXT_CLOSE, RichTextFrame::OnClose) EVT_MENU(RICHTEXT_LEFT_ALIGN, RichTextFrame::OnLeftAlign) @@ -1622,7 +1622,7 @@ BEGIN_EVENT_TABLE(RichTextFrame, wxFrame) EVT_MENU(RICHTEXT_LEFT_INDENT, RichTextFrame::OnLeftIndent) EVT_MENU(RICHTEXT_RIGHT_INDENT, RichTextFrame::OnRightIndent) EVT_MENU(RICHTEXT_TAB_STOPS, RichTextFrame::OnTabStops) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() RichTextFrame::RichTextFrame(wxWindow* parent, const wxString& title): wxFrame(parent, wxID_ANY, title, wxDefaultPosition, wxSize(300, 400)) diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp index 0f0f7db0fd..276837fcc1 100644 --- a/samples/thread/thread.cpp +++ b/samples/thread/thread.cpp @@ -172,7 +172,7 @@ private: bool m_cancelled; wxCriticalSection m_csCancelled; // protects m_cancelled - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -284,7 +284,7 @@ private: MyGUIThread m_thread; int m_nCurrentProgress; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ============================================================================ @@ -323,7 +323,7 @@ bool MyApp::OnInit() // MyFrame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(THREAD_QUIT, MyFrame::OnQuit) EVT_MENU(THREAD_CLEAR, MyFrame::OnClear) EVT_MENU(THREAD_START_THREAD, MyFrame::OnStartThread) @@ -342,7 +342,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_UPDATE_UI(THREAD_START_WORKER, MyFrame::OnUpdateWorker) EVT_THREAD(WORKER_EVENT, MyFrame::OnWorkerEvent) EVT_IDLE(MyFrame::OnIdle) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // My frame constructor MyFrame::MyFrame(const wxString& title) @@ -817,10 +817,10 @@ void MyFrame::OnStartGUIThread(wxCommandEvent& WXUNUSED(event)) // MyImageDialog // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyImageDialog, wxDialog) +wxBEGIN_EVENT_TABLE(MyImageDialog, wxDialog) EVT_THREAD(GUITHREAD_EVENT, MyImageDialog::OnGUIThreadEvent) EVT_PAINT(MyImageDialog::OnPaint) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyImageDialog::MyImageDialog(wxFrame *parent) : wxDialog(parent, wxID_ANY, "Image created by a secondary thread", diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index 81698c35f0..d57a548fdb 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -176,7 +176,7 @@ private: // the search tool, initially NULL wxToolBarToolBase *m_searchTool; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -231,7 +231,7 @@ enum // Notice that wxID_HELP will be processed for the 'About' menu and the toolbar // help button. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_SIZE(MyFrame::OnSize) EVT_MENU(wxID_EXIT, MyFrame::OnQuit) @@ -278,7 +278,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) MyFrame::OnUpdateToggleRadioBtn) EVT_UPDATE_UI(IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT, MyFrame::OnUpdateToggleHorzText) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index 9de78d1081..7ace8a0908 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -71,7 +71,7 @@ static const int NUM_LEVELS = 2; #define MENU_LINK(name) EVT_MENU(TreeTest_##name, MyFrame::On##name) -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_IDLE(MyFrame::OnIdle) EVT_SIZE(MyFrame::OnSize) @@ -147,12 +147,12 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) MENU_LINK(SelectLast) #undef MENU_LINK -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #if USE_GENERIC_TREECTRL -BEGIN_EVENT_TABLE(MyTreeCtrl, wxGenericTreeCtrl) +wxBEGIN_EVENT_TABLE(MyTreeCtrl, wxGenericTreeCtrl) #else -BEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl) +wxBEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl) #endif EVT_TREE_BEGIN_DRAG(TreeTest_Ctrl, MyTreeCtrl::OnBeginDrag) EVT_TREE_BEGIN_RDRAG(TreeTest_Ctrl, MyTreeCtrl::OnBeginRDrag) @@ -186,7 +186,7 @@ BEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl) EVT_RIGHT_DOWN(MyTreeCtrl::OnRMouseDown) EVT_RIGHT_UP(MyTreeCtrl::OnRMouseUp) EVT_RIGHT_DCLICK(MyTreeCtrl::OnRMouseDClick) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() IMPLEMENT_APP(MyApp) diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h index 239e2a6768..1d1ce2ffd7 100644 --- a/samples/treectrl/treetest.h +++ b/samples/treectrl/treetest.h @@ -157,12 +157,12 @@ private: bool m_alternateImages; bool m_alternateStates; - // NB: due to an ugly wxMSW hack you _must_ use DECLARE_DYNAMIC_CLASS() + // NB: due to an ugly wxMSW hack you _must_ use wxDECLARE_DYNAMIC_CLASS(); // if you want your overloaded OnCompareItems() to be called. // OTOH, if you don't want it you may omit the next line - this will // make default (alphabetical) sorting much faster under wxMSW. - DECLARE_DYNAMIC_CLASS(MyTreeCtrl) - DECLARE_EVENT_TABLE() + wxDECLARE_DYNAMIC_CLASS(MyTreeCtrl); + wxDECLARE_EVENT_TABLE(); }; // Define a new frame type @@ -304,7 +304,7 @@ private: void DoSetBold(bool bold = true); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // menu and control ids diff --git a/samples/treelist/treelist.cpp b/samples/treelist/treelist.cpp index 32f94862a7..5523befb54 100644 --- a/samples/treelist/treelist.cpp +++ b/samples/treelist/treelist.cpp @@ -258,7 +258,7 @@ bool MyApp::OnInit() // Main window class // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Id_MultiSelect, MyFrame::OnMultiSelect) EVT_MENU(Id_FlatList, MyFrame::OnFlatList) EVT_MENU_RANGE(Id_Checkboxes_Start, Id_Checkboxes_End, @@ -278,7 +278,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_TREELIST_ITEM_CHECKED(wxID_ANY, MyFrame::OnItemChecked) EVT_TREELIST_ITEM_ACTIVATED(wxID_ANY, MyFrame::OnItemActivated) EVT_TREELIST_ITEM_CONTEXT_MENU(wxID_ANY, MyFrame::OnItemContextMenu) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame() : wxFrame(NULL, wxID_ANY, "wxWidgets tree/list control sample", diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp index 2f0b5a2f93..4708584c58 100644 --- a/samples/typetest/typetest.cpp +++ b/samples/typetest/typetest.cpp @@ -50,7 +50,7 @@ IMPLEMENT_APP (MyApp) IMPLEMENT_DYNAMIC_CLASS (MyApp, wxApp) -BEGIN_EVENT_TABLE(MyApp, wxApp) +wxBEGIN_EVENT_TABLE(MyApp, wxApp) EVT_MENU(TYPES_VARIANT, MyApp::DoVariantDemo) EVT_MENU(TYPES_BYTEORDER, MyApp::DoByteOrderDemo) #if wxUSE_UNICODE @@ -64,7 +64,7 @@ BEGIN_EVENT_TABLE(MyApp, wxApp) EVT_MENU(TYPES_STREAM6, MyApp::DoStreamDemo6) EVT_MENU(TYPES_STREAM7, MyApp::DoStreamDemo7) EVT_MENU(TYPES_MIME, MyApp::DoMIMEDemo) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() wxString file_name = wxT("test_wx.dat"); wxString file_name2 = wxString(wxT("test_wx2.dat")); @@ -1057,10 +1057,10 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) ) } } -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(TYPES_QUIT, MyFrame::OnQuit) EVT_MENU(TYPES_ABOUT, MyFrame::OnAbout) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // My frame constructor MyFrame::MyFrame(wxFrame *parent, const wxString& title, diff --git a/samples/typetest/typetest.h b/samples/typetest/typetest.h index 67a828f5dc..029fada005 100644 --- a/samples/typetest/typetest.h +++ b/samples/typetest/typetest.h @@ -40,8 +40,8 @@ private: wxTextCtrl* m_textCtrl; wxMimeTypesManager *m_mimeDatabase; - DECLARE_DYNAMIC_CLASS(MyApp) - DECLARE_EVENT_TABLE() + wxDECLARE_DYNAMIC_CLASS(MyApp); + wxDECLARE_EVENT_TABLE(); }; DECLARE_APP(MyApp) @@ -57,7 +57,7 @@ public: void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ID for the menu commands diff --git a/samples/uiaction/uiaction.cpp b/samples/uiaction/uiaction.cpp index 56e477c153..7e2ee11726 100644 --- a/samples/uiaction/uiaction.cpp +++ b/samples/uiaction/uiaction.cpp @@ -84,15 +84,15 @@ private: wxButton* m_button; wxTextCtrl* m_text; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_BUTTON(wxID_ANY, MyFrame::OnButtonPressed) EVT_MENU(RunSimulation, MyFrame::OnRunSimulation) EVT_MENU(SimulateText, MyFrame::OnSimulateText) EVT_MENU(wxID_EXIT, MyFrame::OnExit) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #endif // wxUSE_UIACTIONSIMULATOR diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp index 8a7c213bab..5ba919f99e 100644 --- a/samples/validate/validate.cpp +++ b/samples/validate/validate.cpp @@ -146,11 +146,11 @@ bool MyApp::OnInit() // MyFrame // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_EXIT, MyFrame::OnQuit) EVT_MENU(VALIDATE_TEST_DIALOG, MyFrame::OnTestDialog) EVT_MENU(VALIDATE_TOGGLE_BELL, MyFrame::OnToggleBell) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() MyFrame::MyFrame(wxFrame *frame, const wxString&title, int x, int y, int w, int h) : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)), diff --git a/samples/validate/validate.h b/samples/validate/validate.h index b651318307..d3970e1c08 100644 --- a/samples/validate/validate.h +++ b/samples/validate/validate.h @@ -37,7 +37,7 @@ private: wxListBox *m_listbox; bool m_silent; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class MyDialog : public wxDialog diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp index 0edf14cbe6..e9ca0c4373 100644 --- a/samples/vscroll/vstest.cpp +++ b/samples/vscroll/vstest.cpp @@ -94,7 +94,7 @@ private: wxPanel *m_scrollWindow; // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; class VScrollWindow : public wxVScrolledWindow @@ -184,15 +184,15 @@ private: bool m_changed; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(VScrollWindow, wxVScrolledWindow) +wxBEGIN_EVENT_TABLE(VScrollWindow, wxVScrolledWindow) EVT_IDLE(VScrollWindow::OnIdle) EVT_PAINT(VScrollWindow::OnPaint) EVT_SCROLLWIN(VScrollWindow::OnScroll) EVT_MOUSE_EVENTS(VScrollWindow::OnMouse) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() class HScrollWindow : public wxHScrolledWindow { @@ -281,15 +281,15 @@ private: bool m_changed; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(HScrollWindow, wxHScrolledWindow) +wxBEGIN_EVENT_TABLE(HScrollWindow, wxHScrolledWindow) EVT_IDLE(HScrollWindow::OnIdle) EVT_PAINT(HScrollWindow::OnPaint) EVT_SCROLLWIN(HScrollWindow::OnScroll) EVT_MOUSE_EVENTS(HScrollWindow::OnMouse) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() class HVScrollWindow : public wxHVScrolledWindow { @@ -410,15 +410,15 @@ private: bool m_changed; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; -BEGIN_EVENT_TABLE(HVScrollWindow, wxHVScrolledWindow) +wxBEGIN_EVENT_TABLE(HVScrollWindow, wxHVScrolledWindow) EVT_IDLE(HVScrollWindow::OnIdle) EVT_PAINT(HVScrollWindow::OnPaint) EVT_SCROLLWIN(HVScrollWindow::OnScroll) EVT_MOUSE_EVENTS(HVScrollWindow::OnMouse) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ---------------------------------------------------------------------------- // constants @@ -447,14 +447,14 @@ enum // the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. -BEGIN_EVENT_TABLE(VarScrollFrame, wxFrame) +wxBEGIN_EVENT_TABLE(VarScrollFrame, wxFrame) EVT_MENU(VScroll_Quit, VarScrollFrame::OnQuit) EVT_MENU(VScroll_VScrollMode, VarScrollFrame::OnModeVScroll) EVT_MENU(VScroll_HScrollMode, VarScrollFrame::OnModeHScroll) EVT_MENU(VScroll_HVScrollMode, VarScrollFrame::OnModeHVScroll) EVT_MENU(VScroll_About, VarScrollFrame::OnAbout) EVT_SIZE(VarScrollFrame::OnSize) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a diff --git a/samples/widgets/bmpcombobox.cpp b/samples/widgets/bmpcombobox.cpp index f1d0dbfa26..2e2b3fb5f5 100644 --- a/samples/widgets/bmpcombobox.cpp +++ b/samples/widgets/bmpcombobox.cpp @@ -185,7 +185,7 @@ protected: *m_textDelete; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(BitmapComboBoxWidgetsPage) }; @@ -193,7 +193,7 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(BitmapComboBoxWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(BitmapComboBoxWidgetsPage, WidgetsPage) EVT_BUTTON(BitmapComboBoxPage_Reset, BitmapComboBoxWidgetsPage::OnButtonReset) EVT_BUTTON(BitmapComboBoxPage_Change, BitmapComboBoxWidgetsPage::OnButtonChange) EVT_BUTTON(BitmapComboBoxPage_Delete, BitmapComboBoxWidgetsPage::OnButtonDelete) @@ -230,7 +230,7 @@ BEGIN_EVENT_TABLE(BitmapComboBoxWidgetsPage, WidgetsPage) EVT_CHECKBOX(wxID_ANY, BitmapComboBoxWidgetsPage::OnCheckOrRadioBox) EVT_RADIOBOX(wxID_ANY, BitmapComboBoxWidgetsPage::OnCheckOrRadioBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp index ac100e2b5a..08c1e20e2f 100644 --- a/samples/widgets/button.cpp +++ b/samples/widgets/button.cpp @@ -169,7 +169,7 @@ protected: #endif // wxUSE_COMMANDLINKBUTTON private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(ButtonWidgetsPage) }; @@ -177,7 +177,7 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(ButtonWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(ButtonWidgetsPage, WidgetsPage) EVT_BUTTON(ButtonPage_Button, ButtonWidgetsPage::OnButton) EVT_BUTTON(ButtonPage_Reset, ButtonWidgetsPage::OnButtonReset) @@ -186,7 +186,7 @@ BEGIN_EVENT_TABLE(ButtonWidgetsPage, WidgetsPage) EVT_CHECKBOX(wxID_ANY, ButtonWidgetsPage::OnCheckOrRadioBox) EVT_RADIOBOX(wxID_ANY, ButtonWidgetsPage::OnCheckOrRadioBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/checkbox.cpp b/samples/widgets/checkbox.cpp index 6dad1ec2f0..3d79213a60 100644 --- a/samples/widgets/checkbox.cpp +++ b/samples/widgets/checkbox.cpp @@ -123,7 +123,7 @@ protected: wxTextCtrl *m_textLabel; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(CheckBoxWidgetsPage) }; @@ -131,7 +131,7 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(CheckBoxWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(CheckBoxWidgetsPage, WidgetsPage) EVT_CHECKBOX(CheckboxPage_Checkbox, CheckBoxWidgetsPage::OnCheckBox) EVT_BUTTON(CheckboxPage_Reset, CheckBoxWidgetsPage::OnButtonReset) @@ -144,7 +144,7 @@ BEGIN_EVENT_TABLE(CheckBoxWidgetsPage, WidgetsPage) EVT_RADIOBOX(wxID_ANY, CheckBoxWidgetsPage::OnStyleChange) EVT_CHECKBOX(CheckboxPage_ChkRight, CheckBoxWidgetsPage::OnStyleChange) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/choice.cpp b/samples/widgets/choice.cpp index 033a617fce..c78c6540cf 100644 --- a/samples/widgets/choice.cpp +++ b/samples/widgets/choice.cpp @@ -136,7 +136,7 @@ protected: *m_textDelete; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(ChoiceWidgetsPage) }; @@ -144,7 +144,7 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(ChoiceWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(ChoiceWidgetsPage, WidgetsPage) EVT_BUTTON(ChoicePage_Reset, ChoiceWidgetsPage::OnButtonReset) EVT_BUTTON(ChoicePage_Change, ChoiceWidgetsPage::OnButtonChange) EVT_BUTTON(ChoicePage_Delete, ChoiceWidgetsPage::OnButtonDelete) @@ -171,7 +171,7 @@ BEGIN_EVENT_TABLE(ChoiceWidgetsPage, WidgetsPage) EVT_CHECKBOX(wxID_ANY, ChoiceWidgetsPage::OnCheckOrRadioBox) EVT_RADIOBOX(wxID_ANY, ChoiceWidgetsPage::OnCheckOrRadioBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/clrpicker.cpp b/samples/widgets/clrpicker.cpp index 39a91f109b..314a7021ba 100644 --- a/samples/widgets/clrpicker.cpp +++ b/samples/widgets/clrpicker.cpp @@ -102,7 +102,7 @@ protected: wxBoxSizer *m_sizer; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(ColourPickerWidgetsPage) }; @@ -110,13 +110,13 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(ColourPickerWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(ColourPickerWidgetsPage, WidgetsPage) EVT_BUTTON(PickerPage_Reset, ColourPickerWidgetsPage::OnButtonReset) EVT_COLOURPICKER_CHANGED(PickerPage_Colour, ColourPickerWidgetsPage::OnColourChange) EVT_CHECKBOX(wxID_ANY, ColourPickerWidgetsPage::OnCheckBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp index 51c0969e1f..ddc1ec3739 100644 --- a/samples/widgets/combobox.cpp +++ b/samples/widgets/combobox.cpp @@ -168,7 +168,7 @@ protected: *m_textCur; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(ComboboxWidgetsPage) }; @@ -176,7 +176,7 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(ComboboxWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(ComboboxWidgetsPage, WidgetsPage) EVT_BUTTON(ComboPage_Reset, ComboboxWidgetsPage::OnButtonReset) EVT_BUTTON(ComboPage_Popup, ComboboxWidgetsPage::OnButtonPopup) EVT_BUTTON(ComboPage_Dismiss, ComboboxWidgetsPage::OnButtonDismiss) @@ -219,7 +219,7 @@ BEGIN_EVENT_TABLE(ComboboxWidgetsPage, WidgetsPage) EVT_CHECKBOX(wxID_ANY, ComboboxWidgetsPage::OnCheckOrRadioBox) EVT_RADIOBOX(wxID_ANY, ComboboxWidgetsPage::OnCheckOrRadioBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/datepick.cpp b/samples/widgets/datepick.cpp index ab51827524..fb197cbfa1 100644 --- a/samples/widgets/datepick.cpp +++ b/samples/widgets/datepick.cpp @@ -109,7 +109,7 @@ protected: wxTextCtrl *m_textLabel; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(DatePickerWidgetsPage) }; @@ -117,13 +117,13 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(DatePickerWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(DatePickerWidgetsPage, WidgetsPage) EVT_BUTTON(DatePickerPage_Reset, DatePickerWidgetsPage::OnButtonReset) EVT_BUTTON(DatePickerPage_Set, DatePickerWidgetsPage::OnButtonSet) EVT_BUTTON(DatePickerPage_SetRange, DatePickerWidgetsPage::OnButtonSetRange) EVT_DATE_CHANGED(wxID_ANY, DatePickerWidgetsPage::OnDateChanged) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/dirctrl.cpp b/samples/widgets/dirctrl.cpp index b40c47e2e7..49ddcc1fe1 100644 --- a/samples/widgets/dirctrl.cpp +++ b/samples/widgets/dirctrl.cpp @@ -143,7 +143,7 @@ protected: wxCheckBox *m_fltr[3]; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(DirCtrlWidgetsPage) }; @@ -151,14 +151,14 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(DirCtrlWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(DirCtrlWidgetsPage, WidgetsPage) EVT_BUTTON(DirCtrlPage_Reset, DirCtrlWidgetsPage::OnButtonReset) EVT_BUTTON(DirCtrlPage_SetPath, DirCtrlWidgetsPage::OnButtonSetPath) EVT_CHECKBOX(wxID_ANY, DirCtrlWidgetsPage::OnCheckBox) EVT_RADIOBOX(wxID_ANY, DirCtrlWidgetsPage::OnRadioBox) EVT_DIRCTRL_SELECTIONCHANGED(DirCtrlPage_Ctrl, DirCtrlWidgetsPage::OnSelChanged) EVT_DIRCTRL_FILEACTIVATED(DirCtrlPage_Ctrl, DirCtrlWidgetsPage::OnFileActivated) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/dirpicker.cpp b/samples/widgets/dirpicker.cpp index 598c87560e..f9b3bd6339 100644 --- a/samples/widgets/dirpicker.cpp +++ b/samples/widgets/dirpicker.cpp @@ -110,7 +110,7 @@ protected: wxBoxSizer *m_sizer; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(DirPickerWidgetsPage) }; @@ -118,14 +118,14 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(DirPickerWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(DirPickerWidgetsPage, WidgetsPage) EVT_BUTTON(PickerPage_Reset, DirPickerWidgetsPage::OnButtonReset) EVT_BUTTON(PickerPage_SetDir, DirPickerWidgetsPage::OnButtonSetDir) EVT_DIRPICKER_CHANGED(PickerPage_Dir, DirPickerWidgetsPage::OnDirChange) EVT_CHECKBOX(wxID_ANY, DirPickerWidgetsPage::OnCheckBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/editlbox.cpp b/samples/widgets/editlbox.cpp index fb0416f27d..c733df2627 100644 --- a/samples/widgets/editlbox.cpp +++ b/samples/widgets/editlbox.cpp @@ -98,7 +98,7 @@ protected: wxSizer *m_sizerLbox; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(EditableListboxWidgetsPage) }; @@ -106,10 +106,10 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(EditableListboxWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(EditableListboxWidgetsPage, WidgetsPage) EVT_BUTTON(EditableListboxPage_Reset, EditableListboxWidgetsPage::OnButtonReset) EVT_CHECKBOX(wxID_ANY, EditableListboxWidgetsPage::OnCheckBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/filectrl.cpp b/samples/widgets/filectrl.cpp index b77b328ff9..d5700d44b7 100644 --- a/samples/widgets/filectrl.cpp +++ b/samples/widgets/filectrl.cpp @@ -113,7 +113,7 @@ protected: wxCheckBox *m_fltr[3]; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE( FileCtrlWidgetsPage ) }; @@ -121,7 +121,7 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE( FileCtrlWidgetsPage, WidgetsPage ) +wxBEGIN_EVENT_TABLE( FileCtrlWidgetsPage, WidgetsPage ) EVT_BUTTON( FileCtrlPage_Reset, FileCtrlWidgetsPage::OnButtonReset ) EVT_BUTTON( FileCtrlPage_SetDirectory, FileCtrlWidgetsPage::OnButtonSetDirectory ) EVT_BUTTON( FileCtrlPage_SetPath, FileCtrlWidgetsPage::OnButtonSetPath ) @@ -133,7 +133,7 @@ BEGIN_EVENT_TABLE( FileCtrlWidgetsPage, WidgetsPage ) EVT_FILECTRL_FOLDERCHANGED( wxID_ANY, FileCtrlWidgetsPage::OnFileCtrl ) EVT_FILECTRL_SELECTIONCHANGED( wxID_ANY, FileCtrlWidgetsPage::OnFileCtrl ) EVT_FILECTRL_FILEACTIVATED( wxID_ANY, FileCtrlWidgetsPage::OnFileCtrl ) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/filepicker.cpp b/samples/widgets/filepicker.cpp index 9d843c505a..4a513b79f8 100644 --- a/samples/widgets/filepicker.cpp +++ b/samples/widgets/filepicker.cpp @@ -124,7 +124,7 @@ protected: wxBoxSizer *m_sizer; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(FilePickerWidgetsPage) }; @@ -132,7 +132,7 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(FilePickerWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(FilePickerWidgetsPage, WidgetsPage) EVT_BUTTON(PickerPage_Reset, FilePickerWidgetsPage::OnButtonReset) EVT_BUTTON(PickerPage_SetDir, FilePickerWidgetsPage::OnButtonSetDir) @@ -142,7 +142,7 @@ BEGIN_EVENT_TABLE(FilePickerWidgetsPage, WidgetsPage) EVT_RADIOBOX(wxID_ANY, FilePickerWidgetsPage::OnCheckBox) EVT_UPDATE_UI(PickerPage_CurrentPath, FilePickerWidgetsPage::OnUpdatePath) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/fontpicker.cpp b/samples/widgets/fontpicker.cpp index c4f710e241..845bf71521 100644 --- a/samples/widgets/fontpicker.cpp +++ b/samples/widgets/fontpicker.cpp @@ -103,7 +103,7 @@ protected: wxBoxSizer *m_sizer; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(FontPickerWidgetsPage) }; @@ -111,13 +111,13 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(FontPickerWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(FontPickerWidgetsPage, WidgetsPage) EVT_BUTTON(PickerPage_Reset, FontPickerWidgetsPage::OnButtonReset) EVT_FONTPICKER_CHANGED(PickerPage_Font, FontPickerWidgetsPage::OnFontChange) EVT_CHECKBOX(wxID_ANY, FontPickerWidgetsPage::OnCheckBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/gauge.cpp b/samples/widgets/gauge.cpp index 30501c3078..5bf8ade254 100644 --- a/samples/widgets/gauge.cpp +++ b/samples/widgets/gauge.cpp @@ -135,7 +135,7 @@ protected: wxTimer *m_timer; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(GaugeWidgetsPage) }; @@ -143,7 +143,7 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(GaugeWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(GaugeWidgetsPage, WidgetsPage) EVT_BUTTON(GaugePage_Reset, GaugeWidgetsPage::OnButtonReset) EVT_BUTTON(GaugePage_Progress, GaugeWidgetsPage::OnButtonProgress) EVT_BUTTON(GaugePage_IndeterminateProgress, GaugeWidgetsPage::OnButtonIndeterminateProgress) @@ -162,7 +162,7 @@ BEGIN_EVENT_TABLE(GaugeWidgetsPage, WidgetsPage) EVT_TIMER(GaugePage_Timer, GaugeWidgetsPage::OnProgressTimer) EVT_TIMER(GaugePage_IndeterminateTimer, GaugeWidgetsPage::OnIndeterminateProgressTimer) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/hyperlnk.cpp b/samples/widgets/hyperlnk.cpp index 3e18b01adf..f2c6d09fa7 100644 --- a/samples/widgets/hyperlnk.cpp +++ b/samples/widgets/hyperlnk.cpp @@ -121,7 +121,7 @@ protected: wxCheckBox *m_checkGeneric; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(HyperlinkWidgetsPage) }; @@ -129,14 +129,14 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(HyperlinkWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(HyperlinkWidgetsPage, WidgetsPage) EVT_BUTTON(HyperlinkPage_Reset, HyperlinkWidgetsPage::OnButtonReset) EVT_BUTTON(HyperlinkPage_SetLabel, HyperlinkWidgetsPage::OnButtonSetLabel) EVT_BUTTON(HyperlinkPage_SetURL, HyperlinkWidgetsPage::OnButtonSetURL) EVT_RADIOBOX(wxID_ANY, HyperlinkWidgetsPage::OnAlignment) EVT_CHECKBOX(wxID_ANY, HyperlinkWidgetsPage::OnGeneric) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/listbox.cpp b/samples/widgets/listbox.cpp index 615b8f4ccd..a7b62fa28f 100644 --- a/samples/widgets/listbox.cpp +++ b/samples/widgets/listbox.cpp @@ -172,7 +172,7 @@ protected: *m_textDelete; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(ListboxWidgetsPage) }; @@ -180,7 +180,7 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(ListboxWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(ListboxWidgetsPage, WidgetsPage) EVT_BUTTON(ListboxPage_Reset, ListboxWidgetsPage::OnButtonReset) EVT_BUTTON(ListboxPage_Change, ListboxWidgetsPage::OnButtonChange) EVT_BUTTON(ListboxPage_Delete, ListboxWidgetsPage::OnButtonDelete) @@ -212,7 +212,7 @@ BEGIN_EVENT_TABLE(ListboxWidgetsPage, WidgetsPage) EVT_CHECKBOX(wxID_ANY, ListboxWidgetsPage::OnCheckOrRadioBox) EVT_RADIOBOX(wxID_ANY, ListboxWidgetsPage::OnCheckOrRadioBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp index 0a5d282103..ed6899f91b 100644 --- a/samples/widgets/notebook.cpp +++ b/samples/widgets/notebook.cpp @@ -161,14 +161,14 @@ protected: #endif // USE_ICONS_IN_BOOK private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(BookWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(BookWidgetsPage, WidgetsPage) EVT_BUTTON(BookPage_Reset, BookWidgetsPage::OnButtonReset) EVT_BUTTON(BookPage_SelectPage, BookWidgetsPage::OnButtonSelectPage) EVT_BUTTON(BookPage_AddPage, BookWidgetsPage::OnButtonAddPage) @@ -185,7 +185,7 @@ BEGIN_EVENT_TABLE(BookWidgetsPage, WidgetsPage) EVT_CHECKBOX(wxID_ANY, BookWidgetsPage::OnCheckOrRadioBox) EVT_RADIOBOX(wxID_ANY, BookWidgetsPage::OnCheckOrRadioBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation @@ -568,7 +568,7 @@ protected: } private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(NotebookWidgetsPage) }; @@ -576,10 +576,10 @@ private: // event table // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(NotebookWidgetsPage, BookWidgetsPage) +wxBEGIN_EVENT_TABLE(NotebookWidgetsPage, BookWidgetsPage) EVT_NOTEBOOK_PAGE_CHANGING(wxID_ANY, NotebookWidgetsPage::OnPageChanging) EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, NotebookWidgetsPage::OnPageChanged) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() #if defined(__WXUNIVERSAL__) #define FAMILY_CTRLS UNIVERSAL_CTRLS @@ -649,7 +649,7 @@ protected: } private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(ListbookWidgetsPage) }; @@ -657,10 +657,10 @@ private: // event table // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(ListbookWidgetsPage, BookWidgetsPage) +wxBEGIN_EVENT_TABLE(ListbookWidgetsPage, BookWidgetsPage) EVT_LISTBOOK_PAGE_CHANGING(wxID_ANY, ListbookWidgetsPage::OnPageChanging) EVT_LISTBOOK_PAGE_CHANGED(wxID_ANY, ListbookWidgetsPage::OnPageChanged) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(ListbookWidgetsPage, wxT("Listbook"), GENERIC_CTRLS | BOOK_CTRLS @@ -722,7 +722,7 @@ protected: } private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(ChoicebookWidgetsPage) }; @@ -730,10 +730,10 @@ private: // event table // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(ChoicebookWidgetsPage, BookWidgetsPage) +wxBEGIN_EVENT_TABLE(ChoicebookWidgetsPage, BookWidgetsPage) EVT_CHOICEBOOK_PAGE_CHANGING(wxID_ANY, ChoicebookWidgetsPage::OnPageChanging) EVT_CHOICEBOOK_PAGE_CHANGED(wxID_ANY, ChoicebookWidgetsPage::OnPageChanged) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(ChoicebookWidgetsPage, wxT("Choicebook"), GENERIC_CTRLS | BOOK_CTRLS diff --git a/samples/widgets/odcombobox.cpp b/samples/widgets/odcombobox.cpp index 0fd552fbe1..4609f21145 100644 --- a/samples/widgets/odcombobox.cpp +++ b/samples/widgets/odcombobox.cpp @@ -176,7 +176,7 @@ protected: *m_textDelete; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(ODComboboxWidgetsPage) }; @@ -184,7 +184,7 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(ODComboboxWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(ODComboboxWidgetsPage, WidgetsPage) EVT_BUTTON(ODComboPage_Reset, ODComboboxWidgetsPage::OnButtonReset) EVT_BUTTON(ODComboPage_Change, ODComboboxWidgetsPage::OnButtonChange) EVT_BUTTON(ODComboPage_Delete, ODComboboxWidgetsPage::OnButtonDelete) @@ -227,7 +227,7 @@ BEGIN_EVENT_TABLE(ODComboboxWidgetsPage, WidgetsPage) EVT_CHECKBOX(wxID_ANY, ODComboboxWidgetsPage::OnCheckOrRadioBox) EVT_RADIOBOX(wxID_ANY, ODComboboxWidgetsPage::OnCheckOrRadioBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/radiobox.cpp b/samples/widgets/radiobox.cpp index c60d77f7fa..0b75f39990 100644 --- a/samples/widgets/radiobox.cpp +++ b/samples/widgets/radiobox.cpp @@ -139,7 +139,7 @@ protected: *m_textLabelBtns; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(RadioWidgetsPage) }; @@ -147,7 +147,7 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(RadioWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(RadioWidgetsPage, WidgetsPage) EVT_BUTTON(RadioPage_Reset, RadioWidgetsPage::OnButtonReset) EVT_BUTTON(RadioPage_Update, RadioWidgetsPage::OnButtonRecreate) @@ -169,7 +169,7 @@ BEGIN_EVENT_TABLE(RadioWidgetsPage, WidgetsPage) EVT_CHECKBOX(wxID_ANY, RadioWidgetsPage::OnCheckOrRadioBox) EVT_RADIOBOX(wxID_ANY, RadioWidgetsPage::OnCheckOrRadioBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp index 3273920479..d2b621d321 100644 --- a/samples/widgets/searchctrl.cpp +++ b/samples/widgets/searchctrl.cpp @@ -98,7 +98,7 @@ protected: wxCheckBox* m_menuBtnCheck; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(SearchCtrlWidgetsPage) }; @@ -106,14 +106,14 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(SearchCtrlWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(SearchCtrlWidgetsPage, WidgetsPage) EVT_CHECKBOX(ID_SEARCH_CB, SearchCtrlWidgetsPage::OnToggleSearchButton) EVT_CHECKBOX(ID_CANCEL_CB, SearchCtrlWidgetsPage::OnToggleCancelButton) EVT_CHECKBOX(ID_MENU_CB, SearchCtrlWidgetsPage::OnToggleSearchMenu) EVT_SEARCHCTRL_SEARCH_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearch) EVT_SEARCHCTRL_CANCEL_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearchCancel) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp index c16c6fd353..243d6c4482 100644 --- a/samples/widgets/slider.cpp +++ b/samples/widgets/slider.cpp @@ -181,7 +181,7 @@ protected: *m_textThumbLen; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(SliderWidgetsPage) }; @@ -189,7 +189,7 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(SliderWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(SliderWidgetsPage, WidgetsPage) EVT_BUTTON(SliderPage_Reset, SliderWidgetsPage::OnButtonReset) EVT_BUTTON(SliderPage_SetValue, SliderWidgetsPage::OnButtonSetValue) EVT_BUTTON(SliderPage_SetMinAndMax, SliderWidgetsPage::OnButtonSetMinAndMax) @@ -215,7 +215,7 @@ BEGIN_EVENT_TABLE(SliderWidgetsPage, WidgetsPage) EVT_CHECKBOX(wxID_ANY, SliderWidgetsPage::OnCheckOrRadioBox) EVT_RADIOBOX(wxID_ANY, SliderWidgetsPage::OnCheckOrRadioBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp index 6ac58d60bb..f41c9f801c 100644 --- a/samples/widgets/spinbtn.cpp +++ b/samples/widgets/spinbtn.cpp @@ -166,7 +166,7 @@ protected: *m_textBase; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(SpinBtnWidgetsPage) }; @@ -174,7 +174,7 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(SpinBtnWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(SpinBtnWidgetsPage, WidgetsPage) EVT_BUTTON(SpinBtnPage_Reset, SpinBtnWidgetsPage::OnButtonReset) EVT_BUTTON(SpinBtnPage_SetValue, SpinBtnWidgetsPage::OnButtonSetValue) EVT_BUTTON(SpinBtnPage_SetMinAndMax, SpinBtnWidgetsPage::OnButtonSetMinAndMax) @@ -200,7 +200,7 @@ BEGIN_EVENT_TABLE(SpinBtnWidgetsPage, WidgetsPage) EVT_CHECKBOX(wxID_ANY, SpinBtnWidgetsPage::OnCheckOrRadioBox) EVT_RADIOBOX(wxID_ANY, SpinBtnWidgetsPage::OnCheckOrRadioBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp index 9acf45b871..773bc24341 100644 --- a/samples/widgets/static.cpp +++ b/samples/widgets/static.cpp @@ -171,7 +171,7 @@ protected: #endif // wxUSE_MARKUP private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(StaticWidgetsPage) }; @@ -179,7 +179,7 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(StaticWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(StaticWidgetsPage, WidgetsPage) EVT_BUTTON(StaticPage_Reset, StaticWidgetsPage::OnButtonReset) EVT_BUTTON(StaticPage_LabelText, StaticWidgetsPage::OnButtonLabelText) #if wxUSE_MARKUP @@ -189,7 +189,7 @@ BEGIN_EVENT_TABLE(StaticWidgetsPage, WidgetsPage) EVT_CHECKBOX(wxID_ANY, StaticWidgetsPage::OnCheckOrRadioBox) EVT_RADIOBOX(wxID_ANY, StaticWidgetsPage::OnCheckOrRadioBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp index 2d561458fa..a8b97f0f99 100644 --- a/samples/widgets/textctrl.cpp +++ b/samples/widgets/textctrl.cpp @@ -239,7 +239,7 @@ protected: private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(TextWidgetsPage) }; @@ -297,14 +297,14 @@ protected: } private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(TextWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(TextWidgetsPage, WidgetsPage) EVT_IDLE(TextWidgetsPage::OnIdle) EVT_BUTTON(TextPage_Reset, TextWidgetsPage::OnButtonReset) @@ -330,11 +330,11 @@ BEGIN_EVENT_TABLE(TextWidgetsPage, WidgetsPage) EVT_CHECKBOX(wxID_ANY, TextWidgetsPage::OnCheckOrRadioBox) EVT_RADIOBOX(wxID_ANY, TextWidgetsPage::OnCheckOrRadioBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(WidgetsTextCtrl, wxTextCtrl) +wxBEGIN_EVENT_TABLE(WidgetsTextCtrl, wxTextCtrl) EVT_RIGHT_UP(WidgetsTextCtrl::OnRightClick) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/timepick.cpp b/samples/widgets/timepick.cpp index 8086b59574..3f271008ef 100644 --- a/samples/widgets/timepick.cpp +++ b/samples/widgets/timepick.cpp @@ -95,7 +95,7 @@ protected: wxTextCtrl *m_textCur; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(TimePickerWidgetsPage) }; @@ -103,12 +103,12 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(TimePickerWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(TimePickerWidgetsPage, WidgetsPage) EVT_BUTTON(TimePickerPage_Reset, TimePickerWidgetsPage::OnButtonReset) EVT_BUTTON(TimePickerPage_Set, TimePickerWidgetsPage::OnButtonSet) EVT_TIME_CHANGED(wxID_ANY, TimePickerWidgetsPage::OnTimeChanged) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/toggle.cpp b/samples/widgets/toggle.cpp index 1179bf88ee..979c4ee896 100644 --- a/samples/widgets/toggle.cpp +++ b/samples/widgets/toggle.cpp @@ -150,7 +150,7 @@ protected: wxTextCtrl *m_textLabel; private: - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); DECLARE_WIDGETS_PAGE(ToggleWidgetsPage) }; @@ -158,13 +158,13 @@ private: // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(ToggleWidgetsPage, WidgetsPage) +wxBEGIN_EVENT_TABLE(ToggleWidgetsPage, WidgetsPage) EVT_BUTTON(TogglePage_Reset, ToggleWidgetsPage::OnButtonReset) EVT_BUTTON(TogglePage_ChangeLabel, ToggleWidgetsPage::OnButtonChangeLabel) EVT_CHECKBOX(wxID_ANY, ToggleWidgetsPage::OnCheckOrRadioBox) EVT_RADIOBOX(wxID_ANY, ToggleWidgetsPage::OnCheckOrRadioBox) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index 23f5cafda4..88e6bb5eb4 100644 --- a/samples/widgets/widgets.cpp +++ b/samples/widgets/widgets.cpp @@ -218,7 +218,7 @@ private: #endif // wxUSE_MENUS // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; #if USE_LOG @@ -278,7 +278,7 @@ IMPLEMENT_APP(WidgetsApp) // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame) +wxBEGIN_EVENT_TABLE(WidgetsFrame, wxFrame) #if USE_LOG EVT_BUTTON(Widgets_ClearLog, WidgetsFrame::OnButtonClearLog) #endif // USE_LOG @@ -320,7 +320,7 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame) EVT_MENU(wxID_EXIT, WidgetsFrame::OnExit) #endif // wxUSE_MENUS -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // ============================================================================ // implementation diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp index 10cd458de1..9b77f80db1 100644 --- a/samples/wizard/wizard.cpp +++ b/samples/wizard/wizard.cpp @@ -92,7 +92,7 @@ public: private: // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- @@ -238,7 +238,7 @@ public: private: wxRadioBox *m_radio; - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; // This shows how to dynamically (i.e. during run-time) arrange the page order. @@ -339,7 +339,7 @@ private: // event tables and such // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Wizard_Quit, MyFrame::OnQuit) EVT_MENU(Wizard_About, MyFrame::OnAbout) EVT_MENU(Wizard_RunModal, MyFrame::OnRunWizard) @@ -348,12 +348,12 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_WIZARD_CANCEL(wxID_ANY, MyFrame::OnWizardCancel) EVT_WIZARD_FINISHED(wxID_ANY, MyFrame::OnWizardFinished) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() -BEGIN_EVENT_TABLE(wxRadioboxPage, wxWizardPageSimple) +wxBEGIN_EVENT_TABLE(wxRadioboxPage, wxWizardPageSimple) EVT_WIZARD_PAGE_CHANGING(wxID_ANY, wxRadioboxPage::OnWizardPageChanging) EVT_WIZARD_CANCEL(wxID_ANY, wxRadioboxPage::OnWizardCancel) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() IMPLEMENT_APP(MyApp) diff --git a/samples/xrc/custclas.cpp b/samples/xrc/custclas.cpp index 7c642f73b6..64e9deba25 100644 --- a/samples/xrc/custclas.cpp +++ b/samples/xrc/custclas.cpp @@ -62,12 +62,12 @@ IMPLEMENT_DYNAMIC_CLASS( MyResizableListCtrl, wxListCtrl ) // Event table: connect the events to the handler functions to process them //----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE( MyResizableListCtrl, wxListCtrl ) +wxBEGIN_EVENT_TABLE( MyResizableListCtrl, wxListCtrl ) // Something to do when right mouse down EVT_RIGHT_DOWN( MyResizableListCtrl::ContextSensitiveMenu ) // Something to do when resized EVT_SIZE( MyResizableListCtrl::OnSize ) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() //----------------------------------------------------------------------------- // Public methods diff --git a/samples/xrc/custclas.h b/samples/xrc/custclas.h index 585f81597f..842139a249 100644 --- a/samples/xrc/custclas.h +++ b/samples/xrc/custclas.h @@ -32,7 +32,7 @@ class MyResizableListCtrl : public wxListCtrl // NOTE: Using this REQUIRES a default constructor: that means either: giving a // default value for all parameters in your constructor, or else having a dummy // MyResizableListCtrl(){} constructor in addition to your regular one. - DECLARE_DYNAMIC_CLASS( MyResizableListCtrl ) + wxDECLARE_DYNAMIC_CLASS( MyResizableListCtrl ); public: @@ -76,7 +76,7 @@ protected: private: // wxWidgets macro, required to be able to use Event tables in the .cpp file. - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; diff --git a/samples/xrc/derivdlg.cpp b/samples/xrc/derivdlg.cpp index 80c57188bc..a31dd59641 100644 --- a/samples/xrc/derivdlg.cpp +++ b/samples/xrc/derivdlg.cpp @@ -39,12 +39,12 @@ // Event table: connect the events to the handler functions to process them //----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(PreferencesDialog, wxDialog) +wxBEGIN_EVENT_TABLE(PreferencesDialog, wxDialog) EVT_BUTTON( XRCID( "my_button" ), PreferencesDialog::OnMyButtonClicked ) EVT_UPDATE_UI(XRCID( "my_checkbox" ), PreferencesDialog::OnUpdateUIMyCheckbox ) // Note that the ID here isn't a XRCID, it is one of the standard wx ID's. EVT_BUTTON( wxID_OK, PreferencesDialog::OnOK ) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() //----------------------------------------------------------------------------- // Public members diff --git a/samples/xrc/derivdlg.h b/samples/xrc/derivdlg.h index b1bf861f90..0707a1740b 100644 --- a/samples/xrc/derivdlg.h +++ b/samples/xrc/derivdlg.h @@ -51,7 +51,7 @@ private: void OnOK( wxCommandEvent &event ); // Any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp index 2c902d9511..a86de0d2c3 100644 --- a/samples/xrc/myframe.cpp +++ b/samples/xrc/myframe.cpp @@ -77,7 +77,7 @@ // to fire the same kind of event (an EVT_MENU) and thus I give them the same // ID name to help new users emphasize this point which is often overlooked // when starting out with wxWidgets. -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(XRCID("unload_resource_menuitem"), MyFrame::OnUnloadResourceMenuCommand) EVT_MENU(XRCID("reload_resource_menuitem"), MyFrame::OnReloadResourceMenuCommand) EVT_MENU(wxID_EXIT, MyFrame::OnExitToolOrMenuCommand) @@ -92,7 +92,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(XRCID("variable_expansion_tool_or_menuitem"), MyFrame::OnVariableExpansionToolOrMenuCommand) EVT_MENU(XRCID("recursive_load"), MyFrame::OnRecursiveLoad) EVT_MENU(wxID_ABOUT, MyFrame::OnAboutToolOrMenuCommand) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() //----------------------------------------------------------------------------- // Public methods diff --git a/samples/xrc/myframe.h b/samples/xrc/myframe.h index 78276facfd..0a03f71de2 100644 --- a/samples/xrc/myframe.h +++ b/samples/xrc/myframe.h @@ -52,7 +52,7 @@ private: void OnAnimationCtrlPlay(wxCommandEvent& event); // Any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); }; diff --git a/samples/xti/classlist.cpp b/samples/xti/classlist.cpp index 7c7a1b58cd..484acbf8b7 100644 --- a/samples/xti/classlist.cpp +++ b/samples/xti/classlist.cpp @@ -31,14 +31,14 @@ #endif // IMPLEMENT_DYNAMIC_CLASS( ClassListDialog, wxDialog ) -- see the header -BEGIN_EVENT_TABLE( ClassListDialog, wxDialog ) +wxBEGIN_EVENT_TABLE( ClassListDialog, wxDialog ) EVT_LISTBOX( ID_LISTBOX, ClassListDialog::OnListboxSelected ) EVT_TREE_SEL_CHANGED( ID_TREECTRL, ClassListDialog::OnTreectrlSelChanged ) EVT_CHOICEBOOK_PAGE_CHANGED( ID_LISTMODE, ClassListDialog::OnChoiceBookPageChange ) EVT_CHECKBOX( ID_SHOW_ONLY_XTI, ClassListDialog::OnShowOnlyXTICheckbox ) EVT_CHECKBOX( ID_SHOW_PROPERTIES_RECURSIVELY, ClassListDialog::OnShowRecursiveInfoCheckbox ) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() // defined later wxString DumpClassInfo(const wxClassInfo*, bool recursive); diff --git a/samples/xti/classlist.h b/samples/xti/classlist.h index f7c23f2db8..56c97203bc 100644 --- a/samples/xti/classlist.h +++ b/samples/xti/classlist.h @@ -44,10 +44,10 @@ class ClassListDialog: public wxDialog { // we explicitly don't want to use the following macro: - // DECLARE_DYNAMIC_CLASS( ClassListDialog ) + // wxDECLARE_DYNAMIC_CLASS( ClassListDialog ); // as otherwise the ClassListDialog class would appear in the list // shown by this dialog! - DECLARE_EVENT_TABLE() + wxDECLARE_EVENT_TABLE(); public: // Constructors diff --git a/samples/xti/xti.cpp b/samples/xti/xti.cpp index e671067efc..ef70b2146f 100644 --- a/samples/xti/xti.cpp +++ b/samples/xti/xti.cpp @@ -111,14 +111,14 @@ enum // event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(MyFrame, wxFrame) +wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Minimal_Persist, MyFrame::OnPersist) EVT_MENU(Minimal_Depersist, MyFrame::OnDepersist) EVT_MENU(Minimal_GenerateCode, MyFrame::OnGenerateCode) EVT_MENU(Minimal_DumpClasses, MyFrame::OnDumpClasses) EVT_MENU(Minimal_Quit, MyFrame::OnQuit) EVT_MENU(Minimal_About, MyFrame::OnAbout) -END_EVENT_TABLE() +wxEND_EVENT_TABLE() wxIMPLEMENT_APP(MyApp); @@ -240,8 +240,8 @@ MyFrame::MyFrame(const wxString& title) // protected: // wxButton* m_button; // -// DECLARE_EVENT_TABLE() -// DECLARE_DYNAMIC_CLASS_NO_COPY(MyXTIFrame) +// wxDECLARE_EVENT_TABLE(); +// wxDECLARE_DYNAMIC_CLASS_NO_COPY(MyXTIFrame); // }; // // IMPLEMENT_DYNAMIC_CLASS_XTI(MyXTIFrame, MyXTIFrame, "x.h") @@ -257,8 +257,8 @@ MyFrame::MyFrame(const wxString& title) // WX_CONSTRUCTOR_5( MyXTIFrame, wxWindow*, Parent, wxWindowID, Id, // wxString, Title, wxPoint, Position, wxSize, Size ) // -// BEGIN_EVENT_TABLE(MyXTIFrame, wxFrame) -// END_EVENT_TABLE() +// wxBEGIN_EVENT_TABLE(MyXTIFrame, wxFrame) +// wxEND_EVENT_TABLE() // the following class "persists" (i.e. saves) a wxFrame into a wxObjectWriter