don't pass 0 time_t to Borland localtime(), it crashes (bug 1704438); also check...

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

diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h
index 2c8a257f1d0ef516027f72bb27a864b5f0c931f5..af22bc4b54fb96a71ebf4179441e7cbb0914c7e5 100644 (file)
--- a/include/wx/os2/notebook.h
+++ b/include/wx/os2/notebook.h
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _NOTEBOOK_H
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _NOTEBOOK_H


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

                );
 
     //
                );
 
     //


@@ -66,6 +66,9 @@ public:
     //
     int      SetSelection(size_t nPage);
 
     //
     int      SetSelection(size_t nPage);
 

+    // changes selected page without sending events
+    int ChangeSelection(size_t nPage);
+

     //
     // Get the currently selected page
     //
     //
     // Get the currently selected page
     //


@@ -127,7 +130,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 +140,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
                        );
 


@@ -165,7 +168,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: