Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-21 13:26:08 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

use "new" wx-prefixed macros in samples

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 07:07:55 +00:00
parent 08a02f640a
commit 5b4a70247c
162 changed files with 698 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/access/accesstest.cpp
+3 -3
View File
@@ -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
samples/animate/anitest.cpp
+2 -2
View File
@@ -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
samples/animate/anitest.h
+1 -1
View File
@@ -48,5 +48,5 @@ protected:
wxAnimationCtrl* m_animationCtrl;
private:
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
samples/artprov/artbrows.cpp
+2 -2
View File
@@ -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"),
samples/artprov/artbrows.h
+1 -1
View File
@@ -35,7 +35,7 @@ private:
wxStaticText *m_text;
wxString m_client;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
#endif // __ARTBROWS_H__
samples/artprov/arttest.cpp
+3 -3
View File
@@ -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)
samples/aui/auidemo.cpp
+9 -9
View File
@@ -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,
samples/calendar/calendar.cpp
+11 -11
View File
@@ -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")))
samples/caret/caret.cpp
+7 -7
View File
@@ -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,
samples/clipboard/clipboard.cpp
+3 -3
View File
@@ -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)
samples/collpane/collpane.cpp
+6 -6
View File
@@ -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"),
samples/combo/combo.cpp
+9 -9
View File
@@ -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().
samples/config/conftest.cpp
+3 -3
View File
@@ -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
samples/controls/controls.cpp
+18 -18
View File
@@ -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))
samples/dataview/dataview.cpp
+3 -3
View File
@@ -159,7 +159,7 @@ private:
wxLog *m_logOld;
private:
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
@@ -301,7 +301,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 )
@@ -364,7 +364,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))
samples/debugrpt/debugrpt.cpp
+3 -3
View File
@@ -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"),
samples/dialogs/dialogs.cpp
+21 -21
View File
@@ -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)
samples/dialogs/dialogs.h
+8 -8
View File
@@ -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();
};
samples/dialup/nettest.cpp
+6 -6
View File
@@ -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
samples/display/display.cpp
+3 -3
View File
@@ -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
samples/dll/my_dll.cpp
+3 -3
View File
@@ -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)
samples/dll/wx_exe.cpp
+3 -3
View File
@@ -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",
samples/dnd/dnd.cpp
+15 -15
View File
@@ -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
samples/docview/doc.h
+4 -4
View File
@@ -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 wxOVERRIDE;
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
samples/docview/docview.cpp
+2 -2
View File
@@ -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()
{
samples/docview/docview.h
+1 -1
View File
@@ -76,7 +76,7 @@ private:
MyCanvas *m_canvas;
wxMenu *m_menuEdit;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
wxDECLARE_NO_COPY_CLASS(MyApp);
};
samples/docview/view.cpp
+6 -6
View File
@@ -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)
samples/docview/view.h
+6 -6
View File
@@ -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);
};
// ----------------------------------------------------------------------------
samples/dragimag/dragimag.cpp
+6 -6
View File
@@ -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()
{
samples/dragimag/dragimag.h
+4 -4
View File
@@ -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();
};
samples/drawing/drawing.cpp
+6 -6
View File
@@ -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"
@@ -1741,7 +1741,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)
@@ -1755,7 +1755,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)
samples/erase/erase.cpp
+6 -6
View File
@@ -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)
{
samples/event/event.cpp
+12 -12
View File
@@ -78,7 +78,7 @@ public:
virtual int FilterEvent(wxEvent& event) wxOVERRIDE;
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
samples/except/except.cpp
+6 -6
View File
@@ -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
samples/exec/exec.cpp
+9 -9
View File
@@ -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,
samples/flash/flash.cpp
+3 -3
View File
@@ -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)
samples/font/font.cpp
+6 -6
View File
@@ -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
@@ -153,7 +153,7 @@ protected:
private:
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// ----------------------------------------------------------------------------
@@ -220,7 +220,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)
@@ -262,7 +262,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
@@ -1007,9 +1007,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 ),
samples/grid/griddemo.cpp
+5 -5
View File
@@ -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")
samples/grid/griddemo.h
+1 -1
View File
@@ -217,7 +217,7 @@ public:
wxBitmap m_gridBitmap;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
class MyGridCellRenderer : public wxGridCellStringRenderer
samples/help/demo.cpp
+6 -6
View File
@@ -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")))
samples/htlbox/htlbox.cpp
+4 -4
View File
@@ -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)
samples/html/about/about.cpp
+3 -3
View File
@@ -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
samples/html/help/help.cpp
+3 -3
View File
@@ -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
samples/html/htmlctrl/htmlctrl.cpp
+3 -3
View File
@@ -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
samples/html/printing/printing.cpp
+3 -3
View File
@@ -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
samples/html/test/test.cpp
+6 -6
View File
@@ -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))
samples/html/virtual/virtual.cpp
+3 -3
View File
@@ -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
samples/html/widget/widget.cpp
+3 -3
View File
@@ -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
samples/html/zip/zip.cpp
+3 -3
View File
@@ -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
samples/image/canvas.cpp
+2 -2
View File
@@ -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 )

Some files were not shown because too many files have changed in this diff Show More