X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2eb10e2a17a02acaaa32a41304243999f3a862a1..1c0f361be288df133c766e04cc857b3e4682b31a:/include/wx/dialup.h

diff --git a/include/wx/dialup.h b/include/wx/dialup.h
index a38627daf1..1e1ee8c733 100644
--- a/include/wx/dialup.h
+++ b/include/wx/dialup.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DIALUP_H
 #define _WX_DIALUP_H
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "dialup.h"
 #endif
 
@@ -184,7 +184,7 @@ public:
     virtual wxEvent *Clone() const { return new wxDialUpEvent(*this); }
 
 private:
-    DECLARE_NO_COPY_CLASS(wxDialUpEvent)
+    DECLARE_NO_ASSIGN_CLASS(wxDialUpEvent)
 };
 
 // the type of dialup event handler function
@@ -192,9 +192,9 @@ typedef void (wxEvtHandler::*wxDialUpEventFunction)(wxDialUpEvent&);
 
 // macros to catch dialup events
 #define EVT_DIALUP_CONNECTED(func) \
-   DECLARE_EVENT_TABLE_ENTRY( wxEVT_DIALUP_CONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL),
+   DECLARE_EVENT_TABLE_ENTRY( wxEVT_DIALUP_CONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxDialUpEventFunction, & func ), NULL),
 #define EVT_DIALUP_DISCONNECTED(func) \
-   DECLARE_EVENT_TABLE_ENTRY( wxEVT_DIALUP_DISCONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL),
+   DECLARE_EVENT_TABLE_ENTRY( wxEVT_DIALUP_DISCONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxDialUpEventFunction, & func ), NULL),
 
 
 #endif // wxUSE_DIALUP_MANAGER