Initial commit of native OS X list ctrl support. Compile tested on Win, Mac, FC4...

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

diff --git a/include/wx/dialup.h b/include/wx/dialup.h
index 4cacae44b6334f883f3460045e5cfbb18080bb98..18b13b02a5dc3296477d0b4bc7c7387ebf9b9353 100644 (file)
--- a/include/wx/dialup.h
+++ b/include/wx/dialup.h
@@ -12,10 +12,6 @@
 #ifndef _WX_DIALUP_H
 #define _WX_DIALUP_H
 
 #ifndef _WX_DIALUP_H
 #define _WX_DIALUP_H
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "dialup.h"
-#endif
-

 #if wxUSE_DIALUP_MANAGER
 
 #include "wx/event.h"
 #if wxUSE_DIALUP_MANAGER
 
 #include "wx/event.h"


@@ -190,11 +186,14 @@ private:
 // the type of dialup event handler function
 typedef void (wxEvtHandler::*wxDialUpEventFunction)(wxDialUpEvent&);
 
 // the type of dialup event handler function
 typedef void (wxEvtHandler::*wxDialUpEventFunction)(wxDialUpEvent&);
 

+#define wxDialUpEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxDialUpEventFunction, &func)
+

 // 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, wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxDialUpEventFunction, & func ), NULL),
+    wx__DECLARE_EVT0(wxEVT_DIALUP_CONNECTED, wxDialUpEventHandler(func))

 #define EVT_DIALUP_DISCONNECTED(func) \
 #define EVT_DIALUP_DISCONNECTED(func) \

-   DECLARE_EVENT_TABLE_ENTRY( wxEVT_DIALUP_DISCONNECTED, wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxDialUpEventFunction, & func ), NULL),
+    wx__DECLARE_EVT0(wxEVT_DIALUP_DISCONNECTED, wxDialUpEventHandler(func))

 
 
 #endif // wxUSE_DIALUP_MANAGER
 
 
 #endif // wxUSE_DIALUP_MANAGER