X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa6f64c7d8c6c7553e55823f30fc5a1c2ab76f4f..52479aefae169d5c85cd0e07d159db0b8dd0a965:/include/wx/notebook.h?ds=sidebyside diff --git a/include/wx/notebook.h b/include/wx/notebook.h index 1193881d11..d29d1a32e1 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -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 // ----------------------------------------------------- @@ -124,7 +120,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, \ winid, \ -1, \ - (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ + (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ), \ NULL \ ), @@ -133,7 +129,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&); wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, \ winid, \ -1, \ - (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \ + (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxNotebookEventFunction, &fn ), \ NULL \ ),