X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d6fcbcc7088e9c104b3dc5b4704a07f728d55ae..548fa9c1eb08b38b561b7861e1cf93a2ce78772a:/include/wx/generic/notebook.h?ds=sidebyside diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h index 116286eb1e..3f1a607d83 100644 --- a/include/wx/generic/notebook.h +++ b/include/wx/generic/notebook.h @@ -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); @@ -115,7 +113,7 @@ public: // --------- 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)