fixing warning and compile error against 10.4

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

diff --git a/include/wx/dialup.h b/include/wx/dialup.h
index f50c54bf4494177c2a892b8312cf689532836f1e..75c7c630855366ccc7fc11c1e01b5d49eb09447d 100644 (file)
--- a/include/wx/dialup.h
+++ b/include/wx/dialup.h
@@ -43,7 +43,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
  *    main thread?
  */
 
  *    main thread?
  */
 

-class WXDLLEXPORT wxDialUpManager
+class WXDLLIMPEXP_CORE wxDialUpManager

 {
 public:
     // this function should create and return the object of the
 {
 public:
     // this function should create and return the object of the


@@ -152,13 +152,13 @@ public:
 // wxDialUpManager events
 // ----------------------------------------------------------------------------
 
 // 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
 
 // 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)
 {
 public:
     wxDialUpEvent(bool isConnected, bool isOwnEvent) : wxEvent(isOwnEvent)


@@ -180,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) \