made wxTextInputStream Unicode safe and general cleanup (patch 653775)

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

diff --git a/include/wx/dialup.h b/include/wx/dialup.h
index 599abd2d0c9f762d6743b405a0dd3ed57613d56f..b877c6b3698a248ba00993fb55a66ba4c74eb145 100644 (file)
--- a/include/wx/dialup.h
+++ b/include/wx/dialup.h
@@ -9,23 +9,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_NET_H
-#define _WX_NET_H
+#ifndef _WX_DIALUP_H
+#define _WX_DIALUP_H

 
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "dialup.h"
 #endif
 
 #if wxUSE_DIALUP_MANAGER
 
     #pragma interface "dialup.h"
 #endif
 
 #if wxUSE_DIALUP_MANAGER
 

+#include "wx/event.h"
+

 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxArrayString;
 
 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxArrayString;
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
-

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


@@ -156,6 +156,11 @@ 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()
+

 // the event class for the dialup events
 class WXDLLEXPORT wxDialUpEvent : public wxEvent
 {
 // the event class for the dialup events
 class WXDLLEXPORT wxDialUpEvent : public wxEvent
 {


@@ -174,16 +179,14 @@ public:
     // process (i.e. does it result from our own attempt to establish the
     // connection)?
     bool IsOwnEvent() const { return m_id != 0; }
     // process (i.e. does it result from our own attempt to establish the
     // connection)?
     bool IsOwnEvent() const { return m_id != 0; }

+
+    // implement the base class pure virtual
+    virtual wxEvent *Clone() const { return new wxDialUpEvent(*this); }

 };
 
 // the type of dialup event handler function
 typedef void (wxEvtHandler::*wxDialUpEventFunction)(wxDialUpEvent&);
 
 };
 
 // the type of dialup event handler function
 typedef void (wxEvtHandler::*wxDialUpEventFunction)(wxDialUpEvent&);
 

-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EVENT_TYPE(wxEVT_DIALUP_CONNECTED, 450)
-    DECLARE_EVENT_TYPE(wxEVT_DIALUP_DISCONNECTED, 451)
-END_DECLARE_EVENT_TYPES()
-

 // macros to catch dialup events
 #define EVT_DIALUP_CONNECTED(func) \
    DECLARE_EVENT_TABLE_ENTRY( wxEVT_DIALUP_CONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL),
 // macros to catch dialup events
 #define EVT_DIALUP_CONNECTED(func) \
    DECLARE_EVENT_TABLE_ENTRY( wxEVT_DIALUP_CONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL),


@@ -193,4 +196,4 @@ END_DECLARE_EVENT_TYPES()
 
 #endif // wxUSE_DIALUP_MANAGER
 
 
 #endif // wxUSE_DIALUP_MANAGER
 

-#endif // _WX_NET_H
+#endif // _WX_DIALUP_H