Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox

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

diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 009df2910c71504718df7281c06e4dd90ac38325..53fa4926de62a143911df3692072a904242c5115 100644 (file)
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -24,23 +24,22 @@ 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) (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"
 #elif defined(__WXGTK__)
     #include "wx/gtk/tglbtn.h"
 
 #if defined(__WXMSW__)
     #include "wx/msw/tglbtn.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/tglbtn.h"

-/*

 # elif defined(__WXMOTIF__)
 # 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(__WXPALMOS__)
+    #include "wx/palmos/tglbtn.h"
+/*

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

-# elif defined(__WXSTUBS__)
-#  include "wx/stubs/tglbtn.h"

 */
 #endif
 
 */
 #endif