removed GSocket_[Un]Streamed(), GSocket_SetNonOriented() must be used instead

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

diff --git a/include/wx/dialup.h b/include/wx/dialup.h
index a38627daf139d6865d7156fe7d9dabd8b4f5d6ec..63686fe30e15d2155b177d264b9260a6a21604b9 100644 (file)
--- a/include/wx/dialup.h
+++ b/include/wx/dialup.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/dialup.h
 /////////////////////////////////////////////////////////////////////////////
 // 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
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.07.99


@@ -12,7 +12,7 @@
 #ifndef _WX_DIALUP_H
 #define _WX_DIALUP_H
 
 #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
 
     #pragma interface "dialup.h"
 #endif
 


@@ -24,7 +24,7 @@
 // misc
 // ----------------------------------------------------------------------------
 
 // misc
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxArrayString;
+class WXDLLIMPEXP_BASE wxArrayString;

 
 #define WXDIALUP_MANAGER_DEFAULT_BEACONHOST  wxT("www.yahoo.com")
 
 
 #define WXDIALUP_MANAGER_DEFAULT_BEACONHOST  wxT("www.yahoo.com")
 


@@ -184,7 +184,7 @@ public:
     virtual wxEvent *Clone() const { return new wxDialUpEvent(*this); }
 
 private:
     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
 };
 
 // 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) \
 
 // 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) \
 #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
 
 
 #endif // wxUSE_DIALUP_MANAGER