X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/630ad6c6b620b4c24cd5b720b610b539e2770d60..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/generic/notebook.h?ds=sidebyside diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h index cb181e61a4..0dec149510 100644 --- a/include/wx/generic/notebook.h +++ b/include/wx/generic/notebook.h @@ -11,10 +11,6 @@ #ifndef _WX_NOTEBOOK_H_ #define _WX_NOTEBOOK_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "notebook.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -26,15 +22,15 @@ // ---------------------------------------------------------------------------- // 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 // ---------------------------------------------------------------------------- -class wxNotebook : public wxNotebookBase +class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase { public: // ctors @@ -56,7 +52,7 @@ public: long style = 0, const wxString& name = wxNotebookNameStr); // dtor - ~wxNotebook(); + virtual ~wxNotebook(); // accessors // --------- @@ -72,6 +68,9 @@ public: // get the currently selected page int GetSelection() const { return m_nSelection; } + // changes selected page without sending events + int ChangeSelection(size_t nPage); + // set/get the title of a page bool SetPageText(size_t nPage, const wxString& strText); wxString GetPageText(size_t nPage) const; @@ -126,6 +125,8 @@ public: virtual void SetConstraintSizes(bool recurse = true); virtual bool DoPhase(int nPhase); + virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; + // Implementation // wxNotebook on Motif uses a generic wxTabView to implement itself.