Updates to MIME-types and wxFileDialog code for better

[wxWidgets.git] / contrib / include / wx / applet / loadpage.h

diff --git a/contrib/include/wx/applet/loadpage.h b/contrib/include/wx/applet/loadpage.h
index 4be49c0dc9a62ba72348d5704792afe9e6f2199f..223dabc4b7f8bb9a53f98e7cc2982881dce8433b 100644 (file)
--- a/contrib/include/wx/applet/loadpage.h
+++ b/contrib/include/wx/applet/loadpage.h
@@ -82,7 +82,7 @@ public:
 
 // Define the macro to create our event type
 typedef void (wxEvtHandler::*wxLoadPageEventFunction)(wxLoadPageEvent&);
-#define EVT_LOAD_PAGE(fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_LOAD_PAGE, -1, -1, (wxObjectEventFunction)(wxEventFunction)(wxLoadPageEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_LOAD_PAGE(fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_LOAD_PAGE, -1, -1, (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxLoadPageEventFunction, & fn ), (wxObject *) NULL ),
 
 /****************************************************************************
 REMARKS:
@@ -106,7 +106,7 @@ public:
 
 // Define the macro to create our event type
 typedef void (wxEvtHandler::*wxPageLoadedEventFunction)(wxPageLoadedEvent&);
-#define EVT_PAGE_LOADED(fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_PAGE_LOADED, -1, -1, (wxObjectEventFunction)(wxEventFunction)(wxPageLoadedEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_PAGE_LOADED(fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_PAGE_LOADED, -1, -1, (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxPageLoadedEventFunction, & fn ), (wxObject *) NULL ),
 
 
 #endif // __WX_LOAD_PAGE_H