Make list consistent with tree in terms of Vetoed changes closing the inline edit...

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

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 8888288d7e7f6c649744c6de1634a8f7bd8a6bf7..3160358587f11b720fe9834873a8dfa24bc3d1c2 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -41,13 +41,17 @@ enum
 
 typedef wxWindow wxNotebookPage;  // so far, any window can be a page
 
 
 typedef wxWindow wxNotebookPage;  // so far, any window can be a page
 

-#define wxNOTEBOOK_NAME _T("notebook")
+extern WXDLLEXPORT_DATA(const wxChar*) wxNotebookNameStr;
+
+#if WXWIN_COMPATIBILITY_2_4
+    #define wxNOTEBOOK_NAME wxNotebookNameStr
+#endif

 
 // ----------------------------------------------------------------------------
 // wxNotebookBase: define wxNotebook interface
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxNotebookBase: define wxNotebook interface
 // ----------------------------------------------------------------------------
 

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

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


@@ -60,10 +64,10 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,

-                   const wxString& name = wxNOTEBOOK_NAME) ;
+                   const wxString& name = wxNotebookNameStr) ;

 
 

-    // 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 +99,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 +120,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                                                                    \
   ),