Make wxWindow::HasScrollbar() respect wxScrolled::ShowScrollbars().

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

diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index bf455bf31a83fd9de734ac5b90d82a04b3bcece6..8cb2a2e8914bef9ee9c50ceaf4eefbf3bff80029 100644 (file)
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -5,7 +5,6 @@
 // Author:      John Norris, minor changes by Axel Schlueter
 // Modified by:
 // Created:     08.02.01
 // Author:      John Norris, minor changes by Axel Schlueter
 // Modified by:
 // Created:     08.02.01

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 Johnny C. Norris II
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Johnny C. Norris II
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////


@@ -18,17 +17,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

 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
 
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
 

-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
+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() { }


@@ -72,7 +71,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"


@@ -89,12 +88,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_