First nonminimal wxPalmOS functionality: enumeration of available volumes.

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

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 4264acdf562b661854fd6bbab03a36e50d00ea7c..6dbfbe7d829c817e660b9e112332d65d99d7370e 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
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -47,7 +47,7 @@ typedef wxWindow wxNotebookPage;  // so far, any window can be a page
 // wxNotebookBase: define wxNotebook interface
 // ----------------------------------------------------------------------------
 
 // wxNotebookBase: define wxNotebook interface
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxNotebookBase : public wxBookCtrl
+class WXDLLEXPORT wxNotebookBase : public wxBookCtrlBase

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -62,8 +62,8 @@ public:
                    long style = 0,
                    const wxString& name = wxNOTEBOOK_NAME) ;
 
                    long style = 0,
                    const wxString& name = wxNOTEBOOK_NAME) ;
 

-    // wxNotebook-specific additions to wxBookCtrl interface
-    // -----------------------------------------------------
+    // wxNotebook-specific additions to wxBookCtrlBase interface
+    // ---------------------------------------------------------

 
     // get the number of rows for a control with wxNB_MULTILINE style (not all
     // versions support it - they will always return 1 then)
 
     // get the number of rows for a control with wxNB_MULTILINE style (not all
     // versions support it - they will always return 1 then)


@@ -95,12 +95,12 @@ protected:
 // notebook event class and related stuff
 // ----------------------------------------------------------------------------
 
 // notebook event class and related stuff
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxNotebookEvent : public wxBookCtrlEvent
+class WXDLLEXPORT wxNotebookEvent : public wxBookCtrlBaseEvent

 {
 public:
     wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int winid = 0,
                     int nSel = -1, int nOldSel = -1)
 {
 public:
     wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int winid = 0,
                     int nSel = -1, int nOldSel = -1)

-        : wxBookCtrlEvent(commandType, winid, nSel, nOldSel)
+        : wxBookCtrlBaseEvent(commandType, winid, nSel, nOldSel)

     {
     }
 
     {
     }
 


@@ -116,19 +116,19 @@ 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,                                                                     \
+    wxID_ANY,                                                                  \

     (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ),  \
     (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ),  \

-    NULL                                                                    \
+    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,                                                                     \
+    wxID_ANY,                                                                  \

     (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ),  \
     NULL                                                                    \
   ),
     (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ),  \
     NULL                                                                    \
   ),