add yet another overload of assertEquals to fix another compilation error due to...

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

diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h
index 36b8d1fe882494fe4954eecabcb99d867b441d32..83b964c0bf0f63f352866cb59101f35dd33dc132 100644 (file)
--- a/include/wx/os2/notebook.h
+++ b/include/wx/os2/notebook.h
@@ -23,7 +23,7 @@
 // wxNotebook
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxNotebook : public wxNotebookBase
+class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase
 {
 public:
     //
@@ -41,7 +41,7 @@ public:
                ,const wxPoint&  rPos = wxDefaultPosition
                ,const wxSize&   rSize = wxDefaultSize
                ,long            lStyle = 0
-               ,const wxString& rsName = "notebook"
+               ,const wxString& rsName = wxNotebookNameStr
               );
 
     bool Create( wxWindow*       pParent
@@ -49,7 +49,7 @@ public:
                 ,const wxPoint&  rPos = wxDefaultPosition
                 ,const wxSize&   rSize = wxDefaultSize
                 ,long            lStyle = 0
-                ,const wxString& rsName = "notebook"
+                ,const wxString& rsName = wxNotebookNameStr
                );
 
     //
@@ -66,6 +66,9 @@ public:
     //
     int      SetSelection(size_t nPage);
 
+    // changes selected page without sending events
+    int ChangeSelection(size_t nPage);
+
     //
     // Get the currently selected page
     //
@@ -127,7 +130,7 @@ public:
     //
            bool     AddPage( wxNotebookPage* pPage
                             ,const wxString& rsStrText
-                            ,bool            bSelect = FALSE
+                            ,bool            bSelect = false
                             ,int             nImageId = -1
                            );
 
@@ -137,7 +140,7 @@ public:
     bool     InsertPage( size_t nPage
                         ,wxNotebookPage* pPage
                         ,const wxString& rsStrText
-                        ,bool            bSelect = FALSE
+                        ,bool            bSelect = false
                         ,int             nImageId = -1
                        );
 
@@ -152,7 +155,7 @@ public:
     // ---------
     //
     void OnSize(wxSizeEvent& rEvent);
-    void OnSelChange(wxNotebookEvent& rEvent);
+    void OnSelChange(wxBookCtrlEvent& rEvent);
     void OnSetFocus(wxFocusEvent& rEvent);
     void OnNavigationKey(wxNavigationKeyEvent& rEvent);
 
@@ -165,7 +168,7 @@ public:
                              ,WXWORD wPos
                              ,WXHWND hControl
                             );
-    virtual void SetConstraintSizes(bool bRecurse = TRUE);
+    virtual void SetConstraintSizes(bool bRecurse = true);
     virtual bool DoPhase(int nPhase);
 
 protected: