Added SetMin/SetMax

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

diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index 771f744b093fa6c58b9e91d1eadad84bfa3b40b6..4c82009c99910f743725bf7be37c34aed64ab5f6 100644 (file)
--- a/include/wx/univ/notebook.h
+++ b/include/wx/univ/notebook.h
@@ -67,14 +67,14 @@ public:
     // implement wxNotebookBase pure virtuals
     // --------------------------------------
 
     // implement wxNotebookBase pure virtuals
     // --------------------------------------
 

-    virtual int SetSelection(int nPage);
+    virtual int SetSelection(size_t nPage);

     virtual int GetSelection() const { return m_sel; }
 
     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);
 
     virtual void SetPageSize(const wxSize& size);
     virtual void SetPadding(const wxSize& padding);


@@ -84,7 +84,7 @@ public:
 
     virtual bool DeleteAllPages();
 
 
     virtual bool DeleteAllPages();
 

-    virtual bool InsertPage(int nPage,
+    virtual bool InsertPage(size_t nPage,

                             wxNotebookPage *pPage,
                             const wxString& strText,
                             bool bSelect = FALSE,
                             wxNotebookPage *pPage,
                             const wxString& strText,
                             bool bSelect = FALSE,


@@ -94,8 +94,7 @@ public:
     // -----------
 
     // return TRUE if all tabs have the same width
     // -----------
 
     // 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;
 
     // return wxTOP/wxBOTTOM/wxRIGHT/wxLEFT
     wxDirection GetTabOrientation() const;


@@ -120,7 +119,7 @@ public:
     void RefreshCurrent();
 
 protected:
     void RefreshCurrent();
 
 protected:

-    virtual wxNotebookPage *DoRemovePage(int nPage);
+    virtual wxNotebookPage *DoRemovePage(size_t nPage);

 
     // drawing
     virtual void DoDraw(wxControlRenderer *renderer);
 
     // drawing
     virtual void DoDraw(wxControlRenderer *renderer);