Implemented PocketPC menubar/toolbar as wxToolMenuBar derived

[wxWidgets.git] / include / wx / notebook.h

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index d67a95e65a251badf87414fb768f60ae281a339d..02f4a116756bbc3bff3d97788bc0440d8de6c948 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -122,23 +122,14 @@ END_DECLARE_EVENT_TYPES()
 
 typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 
 
 typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 

-#define EVT_NOTEBOOK_PAGE_CHANGED(winid, fn)                                   \
-  DECLARE_EVENT_TABLE_ENTRY(                                                   \
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,                                       \
-    winid,                                                                     \
-    wxID_ANY,                                                                  \
-    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ),  \
-    NULL                                                                       \
-  ),
-
-#define EVT_NOTEBOOK_PAGE_CHANGING(winid, fn)                                  \
-  DECLARE_EVENT_TABLE_ENTRY(                                                   \
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,                                      \
-    winid,                                                                     \
-    wxID_ANY,                                                                  \
-    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ),  \
-    NULL                                                                    \
-  ),
+#define wxNotebookEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxNotebookEventFunction, &func)
+
+#define EVT_NOTEBOOK_PAGE_CHANGED(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, winid, wxNotebookEventHandler(fn))
+
+#define EVT_NOTEBOOK_PAGE_CHANGING(winid, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, winid, wxNotebookEventHandler(fn))

 
 // ----------------------------------------------------------------------------
 // wxNotebook class itself
 
 // ----------------------------------------------------------------------------
 // wxNotebook class itself