X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..c6ea1fdaf924be4ee49a19d12f76e4fcd257bb0a:/include/wx/univ/notebook.h diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h index d2896f472c..7fa65423be 100644 --- a/include/wx/univ/notebook.h +++ b/include/wx/univ/notebook.h @@ -21,15 +21,15 @@ class WXDLLIMPEXP_FWD_CORE wxSpinButton; // ---------------------------------------------------------------------------- // 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 // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNotebook : public wxNotebookBase +class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: // ctors and such @@ -64,7 +64,6 @@ public: // -------------------------------------- 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); } @@ -202,17 +201,14 @@ protected: 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 - void ScrollLastTo(int page); + void ScrollLastTo(size_t page); // the pages titles wxArrayString m_titles; - // the current selection - size_t m_sel; - // the spin button to change the pages wxSpinButton *m_spinbtn;