X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/630ad6c6b620b4c24cd5b720b610b539e2770d60..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/os2/notebook.h diff --git a/include/wx/os2/notebook.h b/include/wx/os2/notebook.h index 30a3a81031..82a7601880 100644 --- a/include/wx/os2/notebook.h +++ b/include/wx/os2/notebook.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: notebook.h +// Name: wx/os2/notebook.h // Purpose: MSW/GTK compatible notebook (a.k.a. property sheet) // Author: David Webster // Modified by: @@ -23,7 +23,7 @@ // wxNotebook // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNotebook : public wxNotebookBase +class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: // @@ -61,15 +61,13 @@ public: // // 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); - // - // Get the currently selected page - // - inline int GetSelection(void) const { return m_nSelection; } + // changes selected page without sending events + int ChangeSelection(size_t nPage); // // Set/Get the title of a page @@ -152,7 +150,7 @@ public: // --------- // void OnSize(wxSizeEvent& rEvent); - void OnSelChange(wxNotebookEvent& rEvent); + void OnSelChange(wxBookCtrlEvent& rEvent); void OnSetFocus(wxFocusEvent& rEvent); void OnNavigationKey(wxNavigationKeyEvent& rEvent); @@ -190,8 +188,6 @@ protected: // Helper functions // - int m_nSelection; // The current selection (-1 if none) - private: wxArrayLong m_alPageId; int m_nTabSize; // holds the largest tab size