X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..af17155e907c863dbba2bbf1c6a91a083569404c:/include/wx/univ/notebook.h diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h index 771f744b09..4c82009c99 100644 --- a/include/wx/univ/notebook.h +++ b/include/wx/univ/notebook.h @@ -67,14 +67,14 @@ public: // implement wxNotebookBase pure virtuals // -------------------------------------- - virtual int SetSelection(int nPage); + virtual int SetSelection(size_t nPage); virtual int GetSelection() const { return m_sel; } - virtual bool SetPageText(int nPage, const wxString& strText); - virtual wxString GetPageText(int nPage) const; + virtual bool SetPageText(size_t nPage, const wxString& strText); + virtual wxString GetPageText(size_t nPage) const; - virtual int GetPageImage(int nPage) const; - virtual bool SetPageImage(int nPage, int nImage); + virtual int GetPageImage(size_t nPage) const; + virtual bool SetPageImage(size_t nPage, int nImage); virtual void SetPageSize(const wxSize& size); virtual void SetPadding(const wxSize& padding); @@ -84,7 +84,7 @@ public: virtual bool DeleteAllPages(); - virtual bool InsertPage(int nPage, + virtual bool InsertPage(size_t nPage, wxNotebookPage *pPage, const wxString& strText, bool bSelect = FALSE, @@ -94,8 +94,7 @@ public: // ----------- // return TRUE if all tabs have the same width - bool FixedSizeTabs() const - { return GetWindowStyle() & wxNB_FIXEDWIDTH != 0; } + bool FixedSizeTabs() const { return HasFlag(wxNB_FIXEDWIDTH); } // return wxTOP/wxBOTTOM/wxRIGHT/wxLEFT wxDirection GetTabOrientation() const; @@ -120,7 +119,7 @@ public: void RefreshCurrent(); protected: - virtual wxNotebookPage *DoRemovePage(int nPage); + virtual wxNotebookPage *DoRemovePage(size_t nPage); // drawing virtual void DoDraw(wxControlRenderer *renderer);