More unicode related cleanup and fixes for wxPython

[wxWidgets.git] / include / wx / gtk / checkbox.h

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index 412b3663b2e0626137086c96f95ad885b9d608b4..0e8cf389b1d858cbabf30a55e5af310b83ed21f7 100644 (file)
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -14,31 +14,11 @@
 #pragma interface
 #endif
 
-#include "wx/defs.h"
-
-#if wxUSE_CHECKBOX
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxCheckBox;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxCheckBoxNameStr;
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // wxCheckBox
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
-class wxCheckBox: public wxControl
+class wxCheckBox : public wxCheckBoxBase
 {
 public:
     wxCheckBox();
@@ -66,6 +46,8 @@ public:
     bool Enable( bool enable );
 
     // implementation
+    // --------------
+
     void ApplyWidgetStyle();
     bool IsOwnGtkWindow( GdkWindow *window );
     void OnInternalIdle();
@@ -73,10 +55,13 @@ public:
     GtkWidget *m_widgetCheckbox;
     GtkWidget *m_widgetLabel;
     
+    bool       m_blockEvent;
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
-#endif
-
 #endif // __GTKCHECKBOXH__