Fix/hack 1.

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

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 91564c3a4db80328f82bbb483371b6b56f480f70..f1e119ff4ab3c717a58abe8359ee14fd0ecc0435 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -38,15 +38,26 @@ private:
 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

-// event macros
+// event types and macros for them

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

+#if defined(__BORLANDC__) && defined(__WIN16__)
+    // For 16-bit BC++, these 2 would be identical otherwise (truncated)
+    #define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED wxEVT_COMMAND_NB_PAGE_CHANGED
+    #define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING wxEVT_COMMAND_NB_PAGE_CHANGING
+#endif
+
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, 802)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, 803)
+END_DECLARE_EVENT_TYPES()
+

 typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 
 // Truncation in 16-bit BC++ means we need to define these differently
 #if defined(__BORLANDC__) && defined(__WIN16__)
 #define EVT_NOTEBOOK_PAGE_CHANGED(id, fn)                                   \
 typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 
 // Truncation in 16-bit BC++ means we need to define these differently
 #if defined(__BORLANDC__) && defined(__WIN16__)
 #define EVT_NOTEBOOK_PAGE_CHANGED(id, fn)                                   \

-  wxEventTableEntry(                                                        \
+  DECLARE_EVENT_TABLE_ENTRY(                                                \

     wxEVT_COMMAND_NB_PAGE_CHANGED,                                          \
     id,                                                                     \
     -1,                                                                     \
     wxEVT_COMMAND_NB_PAGE_CHANGED,                                          \
     id,                                                                     \
     -1,                                                                     \


@@ -55,7 +66,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
   ),
 
 #define EVT_NOTEBOOK_PAGE_CHANGING(id, fn)                                  \
   ),
 
 #define EVT_NOTEBOOK_PAGE_CHANGING(id, fn)                                  \

-  wxEventTableEntry(                                                        \
+  DECLARE_EVENT_TABLE_ENTRY(                                                \

     wxEVT_COMMAND_NB_PAGE_CHANGING,                                         \
     id,                                                                     \
     -1,                                                                     \
     wxEVT_COMMAND_NB_PAGE_CHANGING,                                         \
     id,                                                                     \
     -1,                                                                     \


@@ -66,7 +77,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 #else
 
 #define EVT_NOTEBOOK_PAGE_CHANGED(id, fn)                                   \
 #else
 
 #define EVT_NOTEBOOK_PAGE_CHANGED(id, fn)                                   \

-  wxEventTableEntry(                                                        \
+  DECLARE_EVENT_TABLE_ENTRY(                                                \

     wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,                                    \
     id,                                                                     \
     -1,                                                                     \
     wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,                                    \
     id,                                                                     \
     -1,                                                                     \


@@ -75,7 +86,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
   ),
 
 #define EVT_NOTEBOOK_PAGE_CHANGING(id, fn)                                  \
   ),
 
 #define EVT_NOTEBOOK_PAGE_CHANGING(id, fn)                                  \

-  wxEventTableEntry(                                                        \
+  DECLARE_EVENT_TABLE_ENTRY(                                                \

     wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,                                   \
     id,                                                                     \
     -1,                                                                     \
     wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,                                   \
     id,                                                                     \
     -1,                                                                     \