X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..2f6407b9473f0a3cbd88d6419926b25ab5d6850a:/include/wx/gtk1/notebook.h?ds=sidebyside diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h index bea1b55ffa..097101d094 100644 --- a/include/wx/gtk1/notebook.h +++ b/include/wx/gtk1/notebook.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: tabctrl.h -// Purpose: wxTabCtrl class +// Name: notebook.h +// Purpose: wxNotebook class // Author: Robert Roebling // Modified by: // RCS-ID: $Id$ @@ -8,8 +8,8 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifndef __TABCTRLH__ -#define __TABCTRLH__ +#ifndef __NOTEBOOKH__ +#define __NOTEBOOKH__ #ifdef __GNUG__ #pragma interface "notebook.h" @@ -31,6 +31,7 @@ class wxNotebookPage; // ---------------------------------------------------------------------------- // notebook events // ---------------------------------------------------------------------------- + class wxNotebookEvent : public wxCommandEvent { public: @@ -136,12 +137,12 @@ public: // get the panel which represents the given page wxWindow *GetPage(int nPage) const; - // base class virtuals + // implementation + // -------------- + // base class virtuals virtual void AddChild(wxWindow *child); - -protected: - // wxWin callbacks - void OnSize(wxSizeEvent& event); + virtual void SetConstraintSizes(bool recurse); + virtual bool DoPhase(int phase); private: // common part of all ctors @@ -152,10 +153,9 @@ private: wxImageList* m_imageList; wxList m_pages; - uint m_idHandler; // the change page handler id + size_t m_idHandler; // the change page handler id DECLARE_DYNAMIC_CLASS(wxNotebook) - DECLARE_EVENT_TABLE() }; // ---------------------------------------------------------------------------- @@ -182,4 +182,4 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); }, #endif - // __TABCTRLH__ + // __NOTEBOOKH__