X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa6f64c7d8c6c7553e55823f30fc5a1c2ab76f4f..b057f88ab8d0d448e094204802c9033fad271ccc:/include/wx/notebook.h diff --git a/include/wx/notebook.h b/include/wx/notebook.h index 1193881d11..81ac3b615d 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -5,7 +5,7 @@ // Modified by: // Created: 01.02.01 // RCS-ID: $Id$ -// Copyright: (c) 1996-2000 wxWindows team +// Copyright: (c) 1996-2000 wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -60,11 +60,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxNOTEBOOK_NAME) - : wxBookCtrl(parent, winid, pos, size, style, name) - { - } - + const wxString& name = wxNOTEBOOK_NAME) ; // wxNotebook-specific additions to wxBookCtrl interface // ----------------------------------------------------- @@ -120,20 +116,20 @@ END_DECLARE_EVENT_TYPES() typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); #define EVT_NOTEBOOK_PAGE_CHANGED(winid, fn) \ - DECLARE_EVENT_TABLE_ENTRY( \ - wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, \ + DECLARE_EVENT_TABLE_ENTRY( \ + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, \ winid, \ - -1, \ - (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ - NULL \ + wxID_ANY, \ + (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ), \ + NULL \ ), #define EVT_NOTEBOOK_PAGE_CHANGING(winid, fn) \ - DECLARE_EVENT_TABLE_ENTRY( \ - wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \ + DECLARE_EVENT_TABLE_ENTRY( \ + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \ winid, \ - -1, \ - (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ + wxID_ANY, \ + (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ), \ NULL \ ), @@ -152,7 +148,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); #elif defined(__WXMAC__) #include "wx/mac/notebook.h" #elif defined(__WXCOCOA__) - #include "wx/generic/notebook.h" + #include "wx/cocoa/notebook.h" #elif defined(__WXPM__) #include "wx/os2/notebook.h" #endif