Richtext interface fixes and additions for Phoenix

[wxWidgets.git] / include / wx / dialup.h

diff --git a/include/wx/dialup.h b/include/wx/dialup.h
index 73819e1df8ac80d889f06d195cf99dd972f986d6..f907c7ac230af4033d1a7b28a2ab9376f1b6edac 100644 (file)
--- a/include/wx/dialup.h
+++ b/include/wx/dialup.h
@@ -152,8 +152,10 @@ public:
 // wxDialUpManager events
 // ----------------------------------------------------------------------------
 
 // 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
 
 // the event class for the dialup events
 class WXDLLIMPEXP_CORE wxDialUpEvent : public wxEvent


@@ -169,7 +171,7 @@ public:
     bool IsConnectedEvent() const
         { return GetEventType() == wxEVT_DIALUP_CONNECTED; }
 
     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; }
     // process (i.e. does it result from our own attempt to establish the
     // connection)?
     bool IsOwnEvent() const { return m_id != 0; }


@@ -178,14 +180,14 @@ public:
     virtual wxEvent *Clone() const { return new wxDialUpEvent(*this); }
 
 private:
     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) \
 };
 
 // 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) \
 
 // macros to catch dialup events
 #define EVT_DIALUP_CONNECTED(func) \