X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/856b41f96c08d3a5620435aca1c4f26b444ece9a..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/notebook.h diff --git a/include/wx/notebook.h b/include/wx/notebook.h index ddc7ef40ed..7810274385 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -96,15 +96,15 @@ public: bool SendPageChangingEvent(int nPage); // sends the event about page change from old to new (or GetSelection() if - // new is -1) - void SendPageChangedEvent(int nPageOld, int nPageNew = -1); + // new is wxNOT_FOUND) + void SendPageChangedEvent(int nPageOld, int nPageNew = wxNOT_FOUND); // wxBookCtrlBase overrides this method to return false but we do need // focus because we have tabs virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); } protected: - DECLARE_NO_COPY_CLASS(wxNotebookBase) + wxDECLARE_NO_COPY_CLASS(wxNotebookBase); }; // ---------------------------------------------------------------------------- @@ -118,8 +118,8 @@ protected: typedef wxBookCtrlEventFunction wxNotebookEventFunction; #define wxNotebookEventHandler(func) wxBookCtrlEventHandler(func) -extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED; -extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING; +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxBookCtrlEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, wxBookCtrlEvent ); #define EVT_NOTEBOOK_PAGE_CHANGED(winid, fn) \ wx__DECLARE_EVT1(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))