X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48200154f43831be952cf2503a926af333efb2b5..3d777efedc1e05bd6c2a7c34a00a65895b62bb13:/include/wx/gtk/notebook.h diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h index 45cb903ea5..6edbb84fb1 100644 --- a/include/wx/gtk/notebook.h +++ b/include/wx/gtk/notebook.h @@ -1,9 +1,8 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: notebook.h +// Name: wx/gtk/notebook.h // Purpose: wxNotebook class // Author: Robert Roebling // Modified by: -// RCS-ID: $Id$ // Copyright: (c) Julian Smart and Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -50,7 +49,7 @@ 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) { return DoSetSelection(nPage, SetSelection_SendEvent); } // get the currently selected page @@ -68,13 +67,13 @@ public: bool SetPageImage(size_t nPage, int nImage); // control the appearance of the notebook pages - // set the size (the same for all pages) - void SetPageSize(const wxSize& size); // set the padding between tabs (in pixels) void SetPadding(const wxSize& padding); // sets the size of the tabs (assumes all tabs are the same size) void SetTabSize(const wxSize& sz); + // geometry + virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; // operations @@ -89,7 +88,7 @@ public: wxNotebookPage *win, const wxString& strText, bool bSelect = false, - int imageId = -1 ); + int imageId = NO_IMAGE ); // handler for tab navigation // -------------------------- @@ -107,8 +106,8 @@ public: bool DoPhase(int phase); #endif - // common part of all ctors - void Init(); + // Called by GTK event handler when the current page is definitely changed. + void GTKOnPageChanged(); // helper function wxGtkNotebookPage* GetNotebookPage(int page) const; @@ -135,6 +134,7 @@ private: // the padding set by SetPadding() int m_padding; + void Init(); virtual void AddChildGTK(wxWindowGTK* child); DECLARE_DYNAMIC_CLASS(wxNotebook)