X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a8c929eb49b1ecfad4fa3c3d4e7dbd11213653a..c085e333984dc079a001cd3f581aeb1f51a1f227:/include/wx/gtk1/notebook.h diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h index e423b69564..ddb9ea01a3 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" @@ -139,9 +139,6 @@ public: // implementation // -------------- - // callbacks - void OnSize(wxSizeEvent&); - // base class virtuals virtual void AddChild(wxWindow *child); virtual void SetConstraintSizes(bool recurse); @@ -156,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() }; // ---------------------------------------------------------------------------- @@ -178,7 +174,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, \ @@ -186,4 +182,4 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); }, #endif - // __TABCTRLH__ + // __NOTEBOOKH__