Define wx[U]IntPtr as long, not [s]size_t, in 32 bit builds.

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

diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index dda002abc905d33a3636f31dcdec8c8d6f002c01..7fa65423be6d81a7e765e7c379bb3b9521ae2ef4 100644 (file)
--- a/include/wx/univ/notebook.h
+++ b/include/wx/univ/notebook.h
@@ -21,9 +21,9 @@ class WXDLLIMPEXP_FWD_CORE wxSpinButton;
 // ----------------------------------------------------------------------------
 
 // change the page: to the next/previous/given one
 // ----------------------------------------------------------------------------
 
 // change the page: to the next/previous/given one

-#define wxACTION_NOTEBOOK_NEXT      _T("nexttab")
-#define wxACTION_NOTEBOOK_PREV      _T("prevtab")
-#define wxACTION_NOTEBOOK_GOTO      _T("gototab")
+#define wxACTION_NOTEBOOK_NEXT      wxT("nexttab")
+#define wxACTION_NOTEBOOK_PREV      wxT("prevtab")
+#define wxACTION_NOTEBOOK_GOTO      wxT("gototab")

 
 // ----------------------------------------------------------------------------
 // wxNotebook
 
 // ----------------------------------------------------------------------------
 // wxNotebook


@@ -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); }


@@ -202,17 +201,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;