X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d6fcbcc7088e9c104b3dc5b4704a07f728d55ae..880d76dfb12d4e8466df30d641bb25c6f71bd398:/include/wx/generic/notebook.h diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h index 116286eb1e..1bd34877be 100644 --- a/include/wx/generic/notebook.h +++ b/include/wx/generic/notebook.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: notebook.h +// Name: wx/generic/notebook.h // Purpose: wxNotebook class (a.k.a. property sheet, tabbed dialog) // Author: Julian Smart // Modified by: @@ -22,9 +22,9 @@ // ---------------------------------------------------------------------------- // fwd declarations -class WXDLLEXPORT wxImageList; -class WXDLLEXPORT wxWindow; -class WXDLLEXPORT wxTabView; +class WXDLLIMPEXP_FWD_CORE wxImageList; +class WXDLLIMPEXP_FWD_CORE wxWindow; +class WXDLLIMPEXP_FWD_CORE wxTabView; // ---------------------------------------------------------------------------- // wxNotebook @@ -56,17 +56,15 @@ public: // accessors // --------- - // Find the position of the wxNotebookPage, -1 if not found. + // Find the position of the wxNotebookPage, wxNOT_FOUND if not found. int FindPagePosition(wxNotebookPage* page) const; // set the currently selected page, return the index of the previously - // selected one (or -1 on error) + // selected one (or wxNOT_FOUND on error) // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events int SetSelection(size_t nPage); // cycle thru the tabs // void AdvanceSelection(bool bForward = true); - // get the currently selected page - int GetSelection() const { return m_nSelection; } // changes selected page without sending events int ChangeSelection(size_t nPage); @@ -109,13 +107,13 @@ public: wxNotebookPage *pPage, const wxString& strText, bool bSelect = false, - int imageId = -1); + int imageId = NO_IMAGE); // callbacks // --------- void OnSize(wxSizeEvent& event); void OnInternalIdle(); - void OnSelChange(wxNotebookEvent& event); + void OnSelChange(wxBookCtrlEvent& event); void OnSetFocus(wxFocusEvent& event); void OnNavigationKey(wxNavigationKeyEvent& event); @@ -149,8 +147,6 @@ protected: // helper functions void ChangePage(int nOldSel, int nSel); // change pages - int m_nSelection; // the current selection (-1 if none) - wxTabView* m_tabView; DECLARE_DYNAMIC_CLASS(wxNotebook)