removing outdated code

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

diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index 064eb2cbed1f763c5a27328e2a20166bdf0b6bbf..bbc4250be93b22ad252dce4559396236db2b7df2 100644 (file)
--- a/include/wx/univ/notebook.h
+++ b/include/wx/univ/notebook.h
@@ -64,7 +64,6 @@ public:
     // --------------------------------------
 
     virtual int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }
     // --------------------------------------
 
     virtual int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }

-    virtual int GetSelection() const { return (int) m_sel; }

 
     // changes selected page without sending events
     int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); }
 
     // changes selected page without sending events
     int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); }


@@ -87,7 +86,7 @@ public:
                             wxNotebookPage *pPage,
                             const wxString& strText,
                             bool bSelect = false,
                             wxNotebookPage *pPage,
                             const wxString& strText,
                             bool bSelect = false,

-                            int imageId = -1);
+                            int imageId = NO_IMAGE);

 
     // style tests
     // -----------
 
     // style tests
     // -----------


@@ -131,7 +130,6 @@ protected:
     void DoDrawTab(wxDC& dc, const wxRect& rect, size_t n);
 
     // resizing
     void DoDrawTab(wxDC& dc, const wxRect& rect, size_t n);
 
     // resizing

-    virtual wxSize DoGetBestClientSize() const;

     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoSetSize(int x, int y,
                            int width, int height,


@@ -189,7 +187,7 @@ protected:
 
     // return true if the tab has an associated image
     bool HasImage(int page) const
 
     // return true if the tab has an associated image
     bool HasImage(int page) const

-        { return m_imageList && m_images[page] != -1; }
+        { return HasImageList() && m_images[page] != -1; }

 
     // get the part of the notebook reserved for the pages (slightly larger
     // than GetPageRect() as we draw a border and leave marginin between)
 
     // get the part of the notebook reserved for the pages (slightly larger
     // than GetPageRect() as we draw a border and leave marginin between)


@@ -202,17 +200,14 @@ protected:
     wxSize GetSizeForPage(const wxSize& size) const;
 
     // scroll the tabs so that the first page shown becomes the given one
     wxSize GetSizeForPage(const wxSize& size) const;
 
     // scroll the tabs so that the first page shown becomes the given one

-    void ScrollTo(int page);
+    void ScrollTo(size_t page);

 
     // scroll the tabs so that the first page shown becomes the given one
 
     // scroll the tabs so that the first page shown becomes the given one

-    void ScrollLastTo(int page);
+    void ScrollLastTo(size_t page);

 
     // the pages titles
     wxArrayString m_titles;
 
 
     // the pages titles
     wxArrayString m_titles;
 

-    // the current selection
-    size_t m_sel;
-

     // the spin button to change the pages
     wxSpinButton *m_spinbtn;
 
     // the spin button to change the pages
     wxSpinButton *m_spinbtn;