synchronize GTK2 minimum version in docs

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

diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h
index af22bc4b54fb96a71ebf4179441e7cbb0914c7e5..82a7601880e84e3fd6f65091632326c690a77614 100644 (file)
--- a/include/wx/os2/notebook.h
+++ b/include/wx/os2/notebook.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        notebook.h
+// Name:        wx/os2/notebook.h

 // Purpose:     MSW/GTK compatible notebook (a.k.a. property sheet)
 // Author:      David Webster
 // Modified by:
 // Purpose:     MSW/GTK compatible notebook (a.k.a. property sheet)
 // Author:      David Webster
 // Modified by:


@@ -23,7 +23,7 @@
 // wxNotebook
 // ----------------------------------------------------------------------------
 
 // wxNotebook
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxNotebook : public wxNotebookBase
+class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase

 {
 public:
     //
 {
 public:
     //


@@ -61,7 +61,7 @@ public:
 
     //
     // Set the currently selected page, return the index of the previously
 
     //
     // Set the currently selected page, return the index of the previously

-    // selected one (or -1 on error)
+    // selected one (or wxNOT_FOUND on error)

     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
     //
     int      SetSelection(size_t nPage);
     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
     //
     int      SetSelection(size_t nPage);


@@ -69,11 +69,6 @@ public:
     // changes selected page without sending events
     int ChangeSelection(size_t nPage);
 
     // changes selected page without sending events
     int ChangeSelection(size_t nPage);
 

-    //
-    // Get the currently selected page
-    //
-    inline int      GetSelection(void) const { return m_nSelection; }
-

     //
     // Set/Get the title of a page
     //
     //
     // Set/Get the title of a page
     //


@@ -155,7 +150,7 @@ public:
     // ---------
     //
     void OnSize(wxSizeEvent& rEvent);
     // ---------
     //
     void OnSize(wxSizeEvent& rEvent);

-    void OnSelChange(wxNotebookEvent& rEvent);
+    void OnSelChange(wxBookCtrlEvent& rEvent);

     void OnSetFocus(wxFocusEvent& rEvent);
     void OnNavigationKey(wxNavigationKeyEvent& rEvent);
 
     void OnSetFocus(wxFocusEvent& rEvent);
     void OnNavigationKey(wxNavigationKeyEvent& rEvent);
 


@@ -193,8 +188,6 @@ protected:
     // Helper functions
     //
 
     // Helper functions
     //
 

-    int                     m_nSelection; // The current selection (-1 if none)
-

 private:
     wxArrayLong                     m_alPageId;
     int                             m_nTabSize; // holds the largest tab size
 private:
     wxArrayLong                     m_alPageId;
     int                             m_nTabSize; // holds the largest tab size