X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e450aa692b887adbae4350896f6c90ec8e1368e3..b6e2eddeaf7e559589ce41ac41e88f9bd71c5a08:/include/wx/univ/notebook.h

diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index 3b3ef0c0c7..54103d97eb 100644
--- a/include/wx/univ/notebook.h
+++ b/include/wx/univ/notebook.h
@@ -12,10 +12,12 @@
 #ifndef _WX_UNIV_NOTEBOOK_H_
 #define _WX_UNIV_NOTEBOOK_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "univnotebook.h"
 #endif
 
+#include "wx/arrstr.h"
+
 class WXDLLEXPORT wxSpinButton;
 
 // ----------------------------------------------------------------------------
@@ -65,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);
@@ -82,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,
@@ -118,7 +120,7 @@ public:
     void RefreshCurrent();
 
 protected:
-    virtual wxNotebookPage *DoRemovePage(int nPage);
+    virtual wxNotebookPage *DoRemovePage(size_t nPage);
 
     // drawing
     virtual void DoDraw(wxControlRenderer *renderer);
@@ -193,9 +195,6 @@ protected:
     // get our client size from the page size
     wxSize GetSizeForPage(const wxSize& size) const;
 
-    // change thep age and send events about it (can be vetoed by user code)
-    void ChangePage(int nPage);
-
     // scroll the tabs so that the first page shown becomes the given one
     void ScrollTo(int page);