X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6cbc4db3d59376bb7f0a5a6d2ed4c0b30253683..31ad423e4fb556ec225a63b161154d3bf3445c1b:/include/wx/dialup.h?ds=sidebyside diff --git a/include/wx/dialup.h b/include/wx/dialup.h index 8f4c5ee83b..63686fe30e 100644 --- a/include/wx/dialup.h +++ b/include/wx/dialup.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/dialup.h -// Purpose: Network related wxWindows classes and functions +// Purpose: Network related wxWidgets classes and functions // Author: Vadim Zeitlin // Modified by: // Created: 07.07.99 @@ -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 @@ -24,7 +24,7 @@ // misc // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxArrayString; +class WXDLLIMPEXP_BASE wxArrayString; #define WXDIALUP_MANAGER_DEFAULT_BEACONHOST wxT("www.yahoo.com") @@ -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