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

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index 3737b9eb95..bcf031c96e 100644
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        checkbox.h
+// Name:        wx/gtk/checkbox.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,41 +7,21 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKCHECKBOXH__
 #define __GTKCHECKBOXH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #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,46 @@ 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 );
+    virtual void SetLabel( const wxString& label );
+    virtual bool Enable( bool enable = TRUE );
 
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    
     // implementation
+    // --------------
+
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void OnInternalIdle();
 
-    void ApplyWidgetStyle();
+    GtkWidget *m_widgetCheckbox;
+    GtkWidget *m_widgetLabel;
+
+    bool       m_blockEvent;
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+#ifdef __WXGTK20__
+    void DoSet3StateValue(wxCheckBoxState state);
+    wxCheckBoxState DoGet3StateValue() const;
+#endif
 
-    bool   m_blockFirstEvent;
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
 #endif // __GTKCHECKBOXH__