X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/dialup.h?ds=sidebyside diff --git a/include/wx/dialup.h b/include/wx/dialup.h index 73819e1df8..75c7c63085 100644 --- a/include/wx/dialup.h +++ b/include/wx/dialup.h @@ -152,8 +152,10 @@ public: // wxDialUpManager events // ---------------------------------------------------------------------------- -extern WXDLLIMPEXP_CORE const wxEventType wxEVT_DIALUP_CONNECTED; -extern WXDLLIMPEXP_CORE const wxEventType wxEVT_DIALUP_DISCONNECTED; +class WXDLLIMPEXP_FWD_CORE wxDialUpEvent; + +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIALUP_CONNECTED, wxDialUpEvent ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIALUP_DISCONNECTED, wxDialUpEvent ); // the event class for the dialup events class WXDLLIMPEXP_CORE wxDialUpEvent : public wxEvent @@ -178,14 +180,14 @@ public: virtual wxEvent *Clone() const { return new wxDialUpEvent(*this); } private: - DECLARE_NO_ASSIGN_CLASS(wxDialUpEvent) + wxDECLARE_NO_ASSIGN_CLASS(wxDialUpEvent); }; // the type of dialup event handler function typedef void (wxEvtHandler::*wxDialUpEventFunction)(wxDialUpEvent&); #define wxDialUpEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxDialUpEventFunction, &func) + wxEVENT_HANDLER_CAST(wxDialUpEventFunction, func) // macros to catch dialup events #define EVT_DIALUP_CONNECTED(func) \