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

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