Sorting fixes to wxUniv wxCombo/ListBox [part of bug #1040593].

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

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index f5bab344d7f5698336054d916bd9b5e2debe87de..81ac3b615d6483c0cf3c02c1f0073111a9ce9b3b 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01.02.01
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01.02.01
 // RCS-ID:      $Id$

-// Copyright:   (c) 1996-2000 wxWindows team
+// Copyright:   (c) 1996-2000 wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -53,7 +53,7 @@ public:
     // ctors
     // -----
 
     // ctors
     // -----
 

-    wxNotebookBase();
+    wxNotebookBase() { }

 
     wxNotebookBase(wxWindow *parent,
                    wxWindowID winid,
 
     wxNotebookBase(wxWindow *parent,
                    wxWindowID winid,


@@ -116,20 +116,20 @@ END_DECLARE_EVENT_TYPES()
 typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 
 #define EVT_NOTEBOOK_PAGE_CHANGED(winid, fn)                                   \
 typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 
 #define EVT_NOTEBOOK_PAGE_CHANGED(winid, fn)                                   \

-  DECLARE_EVENT_TABLE_ENTRY(                                                \
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,                                    \
+  DECLARE_EVENT_TABLE_ENTRY(                                                   \
+    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,                                       \

     winid,                                                                     \
     winid,                                                                     \

-    -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
-    NULL                                                                    \
+    wxID_ANY,                                                                  \
+    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ),  \
+    NULL                                                                       \

   ),
 
 #define EVT_NOTEBOOK_PAGE_CHANGING(winid, fn)                                  \
   ),
 
 #define EVT_NOTEBOOK_PAGE_CHANGING(winid, fn)                                  \

-  DECLARE_EVENT_TABLE_ENTRY(                                                \
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,                                   \
+  DECLARE_EVENT_TABLE_ENTRY(                                                   \
+    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,                                      \

     winid,                                                                     \
     winid,                                                                     \

-    -1,                                                                     \
-    (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn,  \
+    wxID_ANY,                                                                  \
+    (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ),  \

     NULL                                                                    \
   ),
 
     NULL                                                                    \
   ),
 


@@ -148,7 +148,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 #elif defined(__WXMAC__)
     #include  "wx/mac/notebook.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
     #include  "wx/mac/notebook.h"
 #elif defined(__WXCOCOA__)

-    #include  "wx/generic/notebook.h"
+    #include  "wx/cocoa/notebook.h"

 #elif defined(__WXPM__)
     #include  "wx/os2/notebook.h"
 #endif
 #elif defined(__WXPM__)
     #include  "wx/os2/notebook.h"
 #endif