and another...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dialup.h b/include/wx/dialup.h
index 599abd2d0c9f762d6743b405a0dd3ed57613d56f..765be098919afb854dba5d2ea9963fad9986e3d3 100644 (file)
--- a/include/wx/dialup.h
+++ b/include/wx/dialup.h
@@ -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
 {


@@ -179,11 +184,6 @@ public:
 // 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),