Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h
index 36b8d1fe882494fe4954eecabcb99d867b441d32..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:
     //


@@ -41,7 +41,7 @@ public:
                ,const wxPoint&  rPos = wxDefaultPosition
                ,const wxSize&   rSize = wxDefaultSize
                ,long            lStyle = 0
                ,const wxPoint&  rPos = wxDefaultPosition
                ,const wxSize&   rSize = wxDefaultSize
                ,long            lStyle = 0

-               ,const wxString& rsName = "notebook"
+               ,const wxString& rsName = wxNotebookNameStr

               );
 
     bool Create( wxWindow*       pParent
               );
 
     bool Create( wxWindow*       pParent


@@ -49,7 +49,7 @@ public:
                 ,const wxPoint&  rPos = wxDefaultPosition
                 ,const wxSize&   rSize = wxDefaultSize
                 ,long            lStyle = 0
                 ,const wxPoint&  rPos = wxDefaultPosition
                 ,const wxSize&   rSize = wxDefaultSize
                 ,long            lStyle = 0

-                ,const wxString& rsName = "notebook"
+                ,const wxString& rsName = wxNotebookNameStr

                );
 
     //
                );
 
     //


@@ -61,15 +61,13 @@ 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);
 

-    //
-    // Get the currently selected page
-    //
-    inline int      GetSelection(void) const { return m_nSelection; }
+    // changes selected page without sending events
+    int ChangeSelection(size_t nPage);

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


@@ -127,7 +125,7 @@ public:
     //
            bool     AddPage( wxNotebookPage* pPage
                             ,const wxString& rsStrText
     //
            bool     AddPage( wxNotebookPage* pPage
                             ,const wxString& rsStrText

-                            ,bool            bSelect = FALSE
+                            ,bool            bSelect = false

                             ,int             nImageId = -1
                            );
 
                             ,int             nImageId = -1
                            );
 


@@ -137,7 +135,7 @@ public:
     bool     InsertPage( size_t nPage
                         ,wxNotebookPage* pPage
                         ,const wxString& rsStrText
     bool     InsertPage( size_t nPage
                         ,wxNotebookPage* pPage
                         ,const wxString& rsStrText

-                        ,bool            bSelect = FALSE
+                        ,bool            bSelect = false

                         ,int             nImageId = -1
                        );
 
                         ,int             nImageId = -1
                        );
 


@@ -152,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);
 


@@ -165,7 +163,7 @@ public:
                              ,WXWORD wPos
                              ,WXHWND hControl
                             );
                              ,WXWORD wPos
                              ,WXHWND hControl
                             );

-    virtual void SetConstraintSizes(bool bRecurse = TRUE);
+    virtual void SetConstraintSizes(bool bRecurse = true);

     virtual bool DoPhase(int nPhase);
 
 protected:
     virtual bool DoPhase(int nPhase);
 
 protected:


@@ -190,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