More broken compilers with enum/wxString& ambiguity.

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

diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 009df2910c71504718df7281c06e4dd90ac38325..a69f362286456ed423cde651b8cf180bb0f14282 100644 (file)
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -24,23 +24,19 @@ BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 19)
 END_DECLARE_EVENT_TYPES()
 
-#define EVT_TOGGLEBUTTON(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_TOGGLEBUTTON(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxCommandEventFunction, & fn ), (wxObject *) NULL ),
 
 #if defined(__WXMSW__)
     #include "wx/msw/tglbtn.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/tglbtn.h"
-/*
 # elif defined(__WXMOTIF__)
-#  include "wx/motif/tglbtn.h"
-# elif defined(__WXQT__)
-#  include "wx/qt/tglbtn.h"
-# elif defined(__WXMAC__)
-#  include "wx/mac/tglbtn.h"
+    #include "wx/motif/tglbtn.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/tglbtn.h"
+/*
 # elif defined(__WXPM__)
 #  include "wx/os2/tglbtn.h"
-# elif defined(__WXSTUBS__)
-#  include "wx/stubs/tglbtn.h"
 */
 #endif