Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 25c4d10bc43a6636e30964e735cc0cf4861a12b7..55cd6e1f7b802ce7e4afc0369ee0585dd49583c5 100644 (file)
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -18,15 +18,17 @@
 #if wxUSE_TOGGLEBTN
 
 #include "wx/event.h"
 #if wxUSE_TOGGLEBTN
 
 #include "wx/event.h"

-#include "wx/control.h"     // base class
+#include "wx/anybutton.h"     // base class

 
 

-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
+extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
+
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_TOGGLEBUTTON, wxCommandEvent );

 
 // ----------------------------------------------------------------------------
 // wxToggleButtonBase
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxToggleButtonBase
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxToggleButtonBase : public wxControl
+class WXDLLIMPEXP_CORE wxToggleButtonBase : public wxAnyButton

 {
 public:
     wxToggleButtonBase() { }
 {
 public:
     wxToggleButtonBase() { }


@@ -70,7 +72,7 @@ protected:
 
 
 #define EVT_TOGGLEBUTTON(id, fn) \
 
 
 #define EVT_TOGGLEBUTTON(id, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, id, wxCommandEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TOGGLEBUTTON, id, wxCommandEventHandler(fn))

 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/tglbtn.h"
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/tglbtn.h"


@@ -87,12 +89,13 @@ protected:
 #elif defined(__WXMAC__)
     #include "wx/osx/tglbtn.h"
     #define wxHAS_BITMAPTOGGLEBUTTON
 #elif defined(__WXMAC__)
     #include "wx/osx/tglbtn.h"
     #define wxHAS_BITMAPTOGGLEBUTTON

-#elif defined(__WXPALMOS__)
-    #include "wx/palmos/tglbtn.h"

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

+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_TOGGLEBUTTON_CLICKED   wxEVT_TOGGLEBUTTON
+

 #endif // wxUSE_TOGGLEBTN
 
 #endif // _WX_TOGGLEBUTTON_H_BASE_
 #endif // wxUSE_TOGGLEBTN
 
 #endif // _WX_TOGGLEBUTTON_H_BASE_