Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 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

6
samples/widgets/bmpcombobox.cpp
View File

@@ -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

6
samples/widgets/button.cpp
View File

@@ -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

6
samples/widgets/checkbox.cpp
View File

@@ -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

6
samples/widgets/choice.cpp
View File

@@ -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

6
samples/widgets/clrpicker.cpp
View File

@@ -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

6
samples/widgets/combobox.cpp
View File

@@ -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

6
samples/widgets/datepick.cpp
View File

@@ -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

6
samples/widgets/dirctrl.cpp
View File

@@ -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

6
samples/widgets/dirpicker.cpp
View File

@@ -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

6
samples/widgets/editlbox.cpp
View File

@@ -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

6
samples/widgets/filectrl.cpp
View File

@@ -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

6
samples/widgets/filepicker.cpp
View File

@@ -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

6
samples/widgets/fontpicker.cpp
View File

@@ -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

6
samples/widgets/gauge.cpp
View File

@@ -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

6
samples/widgets/hyperlnk.cpp
View File

@@ -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

6
samples/widgets/listbox.cpp
View File

@@ -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

24
samples/widgets/notebook.cpp
View File

@@ -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

6
samples/widgets/odcombobox.cpp
View File

@@ -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

6
samples/widgets/radiobox.cpp
View File

@@ -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

6
samples/widgets/searchctrl.cpp
View File

@@ -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

6
samples/widgets/slider.cpp
View File

@@ -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

6
samples/widgets/spinbtn.cpp
View File

@@ -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

6
samples/widgets/static.cpp
View File

@@ -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

12
samples/widgets/textctrl.cpp
View File

@@ -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

6
samples/widgets/timepick.cpp
View File

@@ -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

6
samples/widgets/toggle.cpp
View File

@@ -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

6
samples/widgets/widgets.cpp
View File

@@ -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