Added wxWindow::DoMoveWindow(..)

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

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 49c559be4d6c3b07709f595124904f4e396f88c6..4dea9653ef0504708afd78563549ef0c4405faca 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -43,6 +43,28 @@ private:
 
 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)                                   \
+  {                                                                         \
+    wxEVT_COMMAND_NB_PAGE_CHANGED,                                    \
+    id,                                                                     \
+    -1,                                                                     \
+    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
+    NULL                                                                    \
+  },
+
+#define EVT_NOTEBOOK_PAGE_CHANGING(id, fn)                                  \
+  {                                                                         \
+    wxEVT_COMMAND_NB_PAGE_CHANGING,                                   \
+    id,                                                                     \
+    -1,                                                                     \
+    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
+    NULL                                                                    \
+  },
+
+#else
+
 #define EVT_NOTEBOOK_PAGE_CHANGED(id, fn)                                   \
   {                                                                         \
     wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,                                    \
@@ -61,6 +83,8 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
     NULL                                                                    \
   },
 
+#endif
+
 // ----------------------------------------------------------------------------
 // wxNotebook class itself
 // ----------------------------------------------------------------------------
@@ -78,7 +102,9 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 #elif defined(__WXQT__)
   #include  "wx/qt/notebook.h"
 #elif defined(__WXMAC__)
-  #include  "wx/mac/notebook.h"
+  #include  "wx/generic/notebook.h"
+#elif defined(__WXPM__)
+  #include  "wx/os2/notebook.h"
 #elif defined(__WXSTUBS__)
   #include  "wx/stubs/notebook.h"
 #endif