diff --git a/src/cocoa/notebook.mm b/src/cocoa/notebook.mm index 5e9bab2a0d..0bad47d58d 100644 --- a/src/cocoa/notebook.mm +++ b/src/cocoa/notebook.mm @@ -124,12 +124,6 @@ WX_DECLARE_GET_OBJC_CLASS(WXCTabViewImageItem,NSTabViewItem) @end // implementation WXCTabViewImageItem : NSTabViewItem WX_IMPLEMENT_GET_OBJC_CLASS(WXCTabViewImageItem,NSTabViewItem) -// ======================================================================== -// wxBookCtrlEvent -// ======================================================================== -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) - // ======================================================================== // wxNotebook // ======================================================================== diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp index b0466a3eef..1671877483 100644 --- a/src/common/nbkbase.cpp +++ b/src/common/nbkbase.cpp @@ -35,6 +35,9 @@ // implementation // ============================================================================ +DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) + // ---------------------------------------------------------------------------- // geometry // ---------------------------------------------------------------------------- diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp index 8fd494e9e9..04d8719747 100644 --- a/src/generic/notebook.cpp +++ b/src/generic/notebook.cpp @@ -49,9 +49,6 @@ // event table // ---------------------------------------------------------------------------- -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) - BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase) EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange) EVT_SIZE(wxNotebook::OnSize) diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 338a0ed5ef..d26960c945 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -29,13 +29,6 @@ #include -// ---------------------------------------------------------------------------- -// events -// ---------------------------------------------------------------------------- - -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index 4b81047c5f..d36a803dac 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -31,13 +31,6 @@ #include -// ---------------------------------------------------------------------------- -// events -// ---------------------------------------------------------------------------- - -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) - //----------------------------------------------------------------------------- // idle system //----------------------------------------------------------------------------- diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index e58dcd3b42..6ee2c39230 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -120,9 +120,6 @@ static bool HasTroubleWithNonTopTabs() WX_DEFINE_LIST( wxNotebookPageInfoList ) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) - BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase) EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange) EVT_SIZE(wxNotebook::OnSize) diff --git a/src/os2/notebook.cpp b/src/os2/notebook.cpp index 81e3a98538..9f7df8f3f9 100644 --- a/src/os2/notebook.cpp +++ b/src/os2/notebook.cpp @@ -53,9 +53,6 @@ // event table // ---------------------------------------------------------------------------- -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) - BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase) EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange) EVT_SIZE(wxNotebook::OnSize) diff --git a/src/osx/carbon/notebmac.cpp b/src/osx/carbon/notebmac.cpp index 232d01d258..c534473ad4 100644 --- a/src/osx/carbon/notebmac.cpp +++ b/src/osx/carbon/notebmac.cpp @@ -30,10 +30,6 @@ // check that the page index is valid #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount()) - -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) - BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase) EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange) diff --git a/src/palmos/notebook.cpp b/src/palmos/notebook.cpp index 37063ae141..05b0697c51 100644 --- a/src/palmos/notebook.cpp +++ b/src/palmos/notebook.cpp @@ -38,9 +38,6 @@ WX_DEFINE_LIST( wxNotebookPageInfoList ) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) - BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase) EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange) diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp index e6210f2927..d219fa2162 100644 --- a/src/univ/notebook.cpp +++ b/src/univ/notebook.cpp @@ -76,9 +76,6 @@ protected: static const size_t INVALID_PAGE = (size_t)-1; -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) - // ---------------------------------------------------------------------------- // private classes // ----------------------------------------------------------------------------