Compilation fix after r62754.

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

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index 41f405680cb8b5a0de2385022e04af29494063a0..5ae9c7fb473e16e3b200ae0e8dc11d3a11c3a0bc 100644 (file)
--- 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,39 +7,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GTKCHECKBOX_H_
+#define _WX_GTKCHECKBOX_H_
 
-#ifndef __GTKCHECKBOXH__
-#define __GTKCHECKBOXH__
-
-#ifdef __GNUG__
-#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 WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase
 {
-DECLARE_DYNAMIC_CLASS(wxCheckBox)
-
 public:
     wxCheckBox();
     wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
@@ -62,15 +38,30 @@ public:
     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);
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
+    void DoSet3StateValue(wxCheckBoxState state);
+    wxCheckBoxState DoGet3StateValue() const;
+
+public:
     // implementation
-    void ApplyWidgetStyle();
+    void GTKDisableEvents();
+    void GTKEnableEvents();
 
-    bool       m_blockFirstEvent;
     GtkWidget *m_widgetCheckbox;
     GtkWidget *m_widgetLabel;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
-#endif // __GTKCHECKBOXH__
+#endif // _WX_GTKCHECKBOX_H_