A little fix for Vadim's fix

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

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index 1a0c0ca3993f26ad6c9029b18ad3ae0486e52a49..001bf3f7738b8664f5bc63dd72917766fb68d481 100644 (file)
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -14,31 +14,11 @@
 #pragma interface
 #endif
 
 #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
 // wxCheckBox

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-class wxCheckBox: public wxControl
+class wxCheckBox : public wxCheckBoxBase

 {
 public:
     wxCheckBox();
 {
 public:
     wxCheckBox();


@@ -66,15 +46,20 @@ public:
     bool Enable( bool enable );
 
     // implementation
     bool Enable( bool enable );
 
     // implementation

+    // --------------
+

     void ApplyWidgetStyle();
     void ApplyWidgetStyle();

+    bool IsOwnGtkWindow( GdkWindow *window );
+    void OnInternalIdle();

 
     GtkWidget *m_widgetCheckbox;
     GtkWidget *m_widgetLabel;
 
     GtkWidget *m_widgetCheckbox;
     GtkWidget *m_widgetLabel;

-    
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 

-#endif
-

 #endif // __GTKCHECKBOXH__
 #endif // __GTKCHECKBOXH__