X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21323df7fe84193504be91f0ee20a869707e8412..55809d1394516044a90fa34b12070d0f3e9f1439:/include/wx/os2/notebook.h diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h index 48e60c5b08..af22bc4b54 100644 --- a/include/wx/os2/notebook.h +++ b/include/wx/os2/notebook.h @@ -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 ); // @@ -57,14 +57,17 @@ public: // --------- // Get number of pages in the dialog // - size_t GetPageCount(void) const; + virtual size_t GetPageCount(void) const; // // Set the currently selected page, return the index of the previously // selected one (or -1 on error) // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events // - int SetSelection(int nPage); + int SetSelection(size_t nPage); + + // changes selected page without sending events + int ChangeSelection(size_t nPage); // // Get the currently selected page @@ -74,10 +77,10 @@ public: // // Set/Get the title of a page // - bool SetPageText( int nPage - ,const wxString& sStrText - ); - wxString GetPageText(int nPage) const; + bool SetPageText( size_t nPage + ,const wxString& sStrText + ); + wxString GetPageText(size_t nPage) const; // // Image list stuff: each page may have an image associated with it. All @@ -92,10 +95,10 @@ public: // // Sets/returns item's image index in the current image list // - int GetPageImage(int nPage) const; - bool SetPageImage( int nPage - ,int nImage - ); + int GetPageImage(size_t nPage) const; + bool SetPageImage( size_t nPage + ,int nImage + ); // // Currently it's always 1 because wxGTK doesn't support multi-row @@ -127,19 +130,19 @@ public: // bool AddPage( wxNotebookPage* pPage ,const wxString& rsStrText - ,bool bSelect = FALSE + ,bool bSelect = false ,int nImageId = -1 ); // // The same as AddPage(), but adds it at the specified position // - bool InsertPage( int nPage - ,wxNotebookPage* pPage - ,const wxString& rsStrText - ,bool bSelect = FALSE - ,int nImageId = -1 - ); + bool InsertPage( size_t nPage + ,wxNotebookPage* pPage + ,const wxString& rsStrText + ,bool bSelect = false + ,int nImageId = -1 + ); // // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH @@ -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: @@ -184,7 +187,7 @@ protected: // // Remove one page from the notebook, without deleting // - virtual wxNotebookPage* DoRemovePage(int nPage); + virtual wxNotebookPage* DoRemovePage(size_t nPage); // // Helper functions @@ -203,4 +206,3 @@ private: #endif // wxUSE_NOTEBOOK #endif // _NOTEBOOK_H -