X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..f6669958924c3c3833e2932b65598b06073d2e65:/include/wx/dialup.h diff --git a/include/wx/dialup.h b/include/wx/dialup.h index 18b13b02a5..f907c7ac23 100644 --- a/include/wx/dialup.h +++ b/include/wx/dialup.h @@ -20,7 +20,7 @@ // misc // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_BASE wxArrayString; +class WXDLLIMPEXP_FWD_BASE wxArrayString; #define WXDIALUP_MANAGER_DEFAULT_BEACONHOST wxT("www.yahoo.com") @@ -43,7 +43,7 @@ class WXDLLIMPEXP_BASE wxArrayString; * main thread? */ -class WXDLLEXPORT wxDialUpManager +class WXDLLIMPEXP_CORE wxDialUpManager { public: // this function should create and return the object of the @@ -152,13 +152,13 @@ public: // wxDialUpManager events // ---------------------------------------------------------------------------- -BEGIN_DECLARE_EVENT_TYPES() - DECLARE_EVENT_TYPE(wxEVT_DIALUP_CONNECTED, 450) - DECLARE_EVENT_TYPE(wxEVT_DIALUP_DISCONNECTED, 451) -END_DECLARE_EVENT_TYPES() +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 WXDLLEXPORT wxDialUpEvent : public wxEvent +class WXDLLIMPEXP_CORE wxDialUpEvent : public wxEvent { public: wxDialUpEvent(bool isConnected, bool isOwnEvent) : wxEvent(isOwnEvent) @@ -171,7 +171,7 @@ public: bool IsConnectedEvent() const { return GetEventType() == wxEVT_DIALUP_CONNECTED; } - // does this event come from wxDialUpManager::Dial() or from some extrenal + // does this event come from wxDialUpManager::Dial() or from some external // process (i.e. does it result from our own attempt to establish the // connection)? bool IsOwnEvent() const { return m_id != 0; } @@ -180,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) \