applied part of patch 1169925: fix errors with multibyte <-> wx conversions

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

diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 9a8eebf2361422e2f7462187208ab5aab74d6c5a..53fa4926de62a143911df3692072a904242c5115 100644 (file)
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -24,7 +24,8 @@ BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 19)
 END_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)  wxStaticCastEvent( wxCommandEventFunction, & fn ), (wxObject *) NULL ),
+#define EVT_TOGGLEBUTTON(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, id, wxCommandEventHandler(fn))

 
 #if defined(__WXMSW__)
     #include "wx/msw/tglbtn.h"
 
 #if defined(__WXMSW__)
     #include "wx/msw/tglbtn.h"


@@ -32,9 +33,11 @@ END_DECLARE_EVENT_TYPES()
     #include "wx/gtk/tglbtn.h"
 # elif defined(__WXMOTIF__)
     #include "wx/motif/tglbtn.h"
     #include "wx/gtk/tglbtn.h"
 # elif defined(__WXMOTIF__)
     #include "wx/motif/tglbtn.h"

+#elif defined(__WXMAC__)
+    #include "wx/mac/tglbtn.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/tglbtn.h"

 /*
 /*

-# elif defined(__WXMAC__)
-#  include "wx/mac/tglbtn.h"

 # elif defined(__WXPM__)
 #  include "wx/os2/tglbtn.h"
 */
 # elif defined(__WXPM__)
 #  include "wx/os2/tglbtn.h"
 */