Always initialize SelectInHDC::m_hgdiobj in wxMSW.

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

diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 63c2757b1c181d3f2a525cd08bffaf2ad0053e8b..380c617886d0d4d2802a1271bee4e792f24a1b74 100644 (file)
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -18,7 +18,9 @@
 #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[];

 
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
 
 
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
 


@@ -26,7 +28,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED,
 // wxToggleButtonBase
 // ----------------------------------------------------------------------------
 
 // wxToggleButtonBase
 // ----------------------------------------------------------------------------
 

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

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


@@ -76,14 +78,17 @@ protected:
     #include "wx/univ/tglbtn.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/tglbtn.h"
     #include "wx/univ/tglbtn.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/tglbtn.h"

+    #define wxHAS_BITMAPTOGGLEBUTTON

 #elif defined(__WXGTK20__)
     #include "wx/gtk/tglbtn.h"
 #elif defined(__WXGTK20__)
     #include "wx/gtk/tglbtn.h"

+    #define wxHAS_BITMAPTOGGLEBUTTON

 #elif defined(__WXGTK__)
     #include "wx/gtk1/tglbtn.h"
 # elif defined(__WXMOTIF__)
     #include "wx/motif/tglbtn.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/tglbtn.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk1/tglbtn.h"
 # elif defined(__WXMOTIF__)
     #include "wx/motif/tglbtn.h"
 #elif defined(__WXMAC__)
     #include "wx/osx/tglbtn.h"

+    #define wxHAS_BITMAPTOGGLEBUTTON

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