moved MGL initialization to earlier stage (crashes otherwise...) and implemented...

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

diff --git a/include/wx/dialup.h b/include/wx/dialup.h
index 182374aa1598b46219f15d34293c60b15ab7c9e1..765be098919afb854dba5d2ea9963fad9986e3d3 100644 (file)
--- a/include/wx/dialup.h
+++ b/include/wx/dialup.h
@@ -24,7 +24,7 @@
 
 class WXDLLEXPORT wxArrayString;
 
 
 class WXDLLEXPORT wxArrayString;
 

-extern const wxChar *wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;

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


@@ -153,9 +153,14 @@ public:
 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

-// DIALUP events processing
+// 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
 {


@@ -177,11 +182,14 @@ public:
 };
 
 // the type of dialup event handler function
 };
 
 // the type of dialup event handler function

-typedef void (wxObject::*wxDialUpEventFunction)(wxDialUpEvent&);
+typedef void (wxEvtHandler::*wxDialUpEventFunction)(wxDialUpEvent&);

 
 // macros to catch dialup events
 
 // macros to catch dialup events

-#define EVT_DIALUP_CONNECTED(func) { wxEVT_DIALUP_CONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL},
-#define EVT_DIALUP_DISCONNECTED(func) { wxEVT_DIALUP_DISCONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL},
+#define EVT_DIALUP_CONNECTED(func) \
+   DECLARE_EVENT_TABLE_ENTRY( wxEVT_DIALUP_CONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL),
+#define EVT_DIALUP_DISCONNECTED(func) \
+   DECLARE_EVENT_TABLE_ENTRY( wxEVT_DIALUP_DISCONNECTED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDialUpEventFunction) & func, NULL),
+

 
 #endif // wxUSE_DIALUP_MANAGER
 
 
 #endif // wxUSE_DIALUP_MANAGER