X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d6fcbcc7088e9c104b3dc5b4704a07f728d55ae..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/msw/notebook.h diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 0b99f664d5..969e732145 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -23,7 +23,7 @@ // wxNotebook // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNotebookPageInfo : public wxObject +class WXDLLIMPEXP_CORE wxNotebookPageInfo : public wxObject { public : wxNotebookPageInfo() { m_page = NULL; m_imageId = -1; m_selected = false; } @@ -57,7 +57,7 @@ private: WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList ); -class WXDLLEXPORT wxNotebook : public wxNotebookBase +class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: // ctors @@ -150,7 +150,7 @@ public: // callbacks // --------- void OnSize(wxSizeEvent& event); - void OnSelChange(wxNotebookEvent& event); + void OnSelChange(wxBookCtrlEvent& event); void OnNavigationKey(wxNavigationKeyEvent& event); // base class virtuals @@ -196,8 +196,9 @@ protected: // common part of all ctors void Init(); - // hides m_nSelection-th page, shows the newsel-th one and updates m_nSelection - void UpdateSelection(size_t newsel); + // hides the currently shown page and shows the given one (if not -1) and + // updates m_nSelection accordingly + void UpdateSelection(int selNew); // remove one page from the notebook, without deleting virtual wxNotebookPage *DoRemovePage(size_t nPage);