X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5180055b697078e8c6ec7db485f1f1bfa3e91abd..22d080f35b173d2a855078d11e6b142b4e6d79a7:/include/wx/generic/notebook.h diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h index 91cc13f725..f55b0db48f 100644 --- a/include/wx/generic/notebook.h +++ b/include/wx/generic/notebook.h @@ -11,7 +11,7 @@ #ifndef _WX_NOTEBOOK_H_ #define _WX_NOTEBOOK_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "notebook.h" #endif @@ -47,14 +47,14 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = "notebook"); + const wxString& name = wxT("notebook")); // Create() function bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = "notebook"); + const wxString& name = wxT("notebook")); // dtor ~wxNotebook(); @@ -66,23 +66,23 @@ public: // 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); // cycle thru the tabs // void AdvanceSelection(bool bForward = TRUE); // get the currently selected page int GetSelection() const { return m_nSelection; } // set/get the title of a page - bool SetPageText(int nPage, const wxString& strText); - wxString GetPageText(int nPage) const; + bool SetPageText(size_t nPage, const wxString& strText); + wxString GetPageText(size_t nPage) const; // get the number of rows for a control with wxNB_MULTILINE style (not all // versions support it - they will always return 1 then) virtual int GetRowCount() const ; // 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); // control the appearance of the notebook pages // set the size (the same for all pages) @@ -96,15 +96,17 @@ public: // operations // ---------- // remove one page from the notebook, and delete the page. - bool DeletePage(int nPage); + bool DeletePage(size_t nPage); bool DeletePage(wxNotebookPage* page); // remove one page from the notebook, without deleting the page. - bool RemovePage(int nPage); + bool RemovePage(size_t nPage); bool RemovePage(wxNotebookPage* page); + virtual wxWindow* DoRemovePage(size_t nPage); + // remove all pages bool DeleteAllPages(); // the same as AddPage(), but adds it at the specified position - bool InsertPage(int nPage, + bool InsertPage(size_t nPage, wxNotebookPage *pPage, const wxString& strText, bool bSelect = FALSE,