X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..6d7184953a7446bbbfa0822cea030e51cdc95bfc:/include/wx/dialup.h?ds=inline diff --git a/include/wx/dialup.h b/include/wx/dialup.h index b877c6b369..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 @@ -182,6 +182,9 @@ public: // implement the base class pure virtual virtual wxEvent *Clone() const { return new wxDialUpEvent(*this); } + +private: + DECLARE_NO_ASSIGN_CLASS(wxDialUpEvent) }; // the type of dialup event handler function @@ -189,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