X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff8bfdbbb14af4cd77de9d3534b1cd4f7a033137..ccdcde00d9ae27ca20ff6c3c9495918a0ec725aa:/include/wx/gtk/checkbox.h?ds=sidebyside

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index 3737b9eb95..0e8cf389b1 100644
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -7,7 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKCHECKBOXH__
 #define __GTKCHECKBOXH__
 
@@ -15,33 +14,14 @@
 #pragma interface
 #endif
 
-#include "wx/defs.h"
-#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
 {
-DECLARE_DYNAMIC_CLASS(wxCheckBox)
-
 public:
-    wxCheckBox(void);
+    wxCheckBox();
     wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
@@ -50,22 +30,38 @@ public:
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
-    bool Create( wxWindow *parent, wxWindowID id, const wxString& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr );
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxCheckBoxNameStr );
+
     void SetValue( bool state );
     bool GetValue() const;
 
     void SetLabel( const wxString& label );
-    void Enable( bool enable );
+    bool Enable( bool enable );
 
     // implementation
+    // --------------
 
     void ApplyWidgetStyle();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void OnInternalIdle();
+
+    GtkWidget *m_widgetCheckbox;
+    GtkWidget *m_widgetLabel;
+    
+    bool       m_blockEvent;
+
+protected:
+    virtual wxSize DoGetBestSize() const;
 
-    bool   m_blockFirstEvent;
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
 #endif // __GTKCHECKBOXH__