cleaning up problems after string changes

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

diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 22e136c7fedebd0ba46b9d64503c91c865a80b18..7ac6ec9840207f307c3289042f7566c11f72df46 100644 (file)
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -7,7 +7,7 @@
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II
-// License:     Rocketeer license
+// License:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOGGLEBUTTON_H_BASE_
@@ -24,22 +24,25 @@ 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, wxID_ANY, (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__)
+#if defined(__WXUNIVERSAL__)
+    #include "wx/univ/tglbtn.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/tglbtn.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/tglbtn.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/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(__WXPM__)
-#  include "wx/os2/tglbtn.h"
-*/
+#elif defined(__WXPM__)
+    #include "wx/os2/tglbtn.h"
 #endif
 
 #endif // wxUSE_TOGGLEBTN