X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c86f1403c3737c07d58676a203f4707942684a01..ed7174bafef77f3e99c5d47976f6ba1365960866:/include/wx/gtk/notebook.h diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h index 097101d094..46ae493e57 100644 --- a/include/wx/gtk/notebook.h +++ b/include/wx/gtk/notebook.h @@ -8,11 +8,11 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifndef __NOTEBOOKH__ -#define __NOTEBOOKH__ +#ifndef __GTKNOTEBOOKH__ +#define __GTKNOTEBOOKH__ #ifdef __GNUG__ -#pragma interface "notebook.h" +#pragma interface #endif #include "wx/defs.h" @@ -137,14 +137,13 @@ public: // get the panel which represents the given page wxWindow *GetPage(int nPage) const; + // implementation - // -------------- - // base class virtuals - virtual void AddChild(wxWindow *child); - virtual void SetConstraintSizes(bool recurse); - virtual bool DoPhase(int phase); + + void SetConstraintSizes(bool recurse); + bool DoPhase(int phase); + void ApplyWidgetStyle(); -private: // common part of all ctors void Init(); @@ -174,7 +173,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); #define EVT_NOTEBOOK_PAGE_CHANGING(id, fn) \ { \ - wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \ \ + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \ id, \ -1, \ (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ @@ -182,4 +181,4 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); }, #endif - // __NOTEBOOKH__ + // __GTKNOTEBOOKH__