X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0201182bf56889e11f925f8a6c9f967d5c598a10..1338c59a025505bc066be220fe56e898a72b3ad3:/include/wx/notebook.h diff --git a/include/wx/notebook.h b/include/wx/notebook.h index eb2b8af14e..54ad1df040 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -67,7 +67,7 @@ public: // --------- // get number of pages in the dialog - int GetPageCount() const { return m_pages.GetCount(); } + int GetPageCount() const { return (int) m_pages.GetCount(); } // get the panel which represents the given page wxNotebookPage *GetPage(int nPage) { return m_pages[nPage]; } @@ -107,7 +107,7 @@ public: virtual void SetTabSize(const wxSize& sz) = 0; // calculate the size of the notebook from the size of its page - virtual wxSize CalcSizeFromPage(const wxSize& sizePage); + virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; // operations // ---------- @@ -155,6 +155,8 @@ public: protected: // remove the page and return a pointer to it virtual wxNotebookPage *DoRemovePage(int page); + // return the minimum size large enough to display the largest page entirely + virtual wxSize DoGetBestSize() const; // common part of all ctors void Init();