X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83058c584ffe23c0766665ff58e2bf5bc680b129..2d4957f2401a8814f90cda21ef945d99bc74596e:/include/wx/gtk/checkbox.h?ds=sidebyside

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index d83a8d59ea..11f89e0a47 100644
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -1,68 +1,67 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        checkbox.h
+// Name:        wx/gtk/checkbox.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// 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"
+// ----------------------------------------------------------------------------
+// wxCheckBox
+// ----------------------------------------------------------------------------
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+class wxCheckBox : public wxCheckBoxBase
+{
+public:
+    wxCheckBox();
+    wxCheckBox( 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)
+    {
+        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 );
+
+    void SetValue( bool state );
+    bool GetValue() const;
 
-class wxCheckBox;
+    virtual void SetLabel( const wxString& label );
+    virtual bool Enable( bool enable = TRUE );
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+    // implementation
+    // --------------
 
-extern const char *wxCheckBoxNameStr;
+    void ApplyWidgetStyle();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void OnInternalIdle();
 
-//-----------------------------------------------------------------------------
-// wxCheckBox
-//-----------------------------------------------------------------------------
+    GtkWidget *m_widgetCheckbox;
+    GtkWidget *m_widgetLabel;
 
-class wxCheckBox: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxCheckBox)
+    bool       m_blockEvent;
 
-  public:
+protected:
+    virtual wxSize DoGetBestSize() const;
 
-    wxCheckBox(void);
-    inline wxCheckBox( 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)
-    {
-      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 );
-    void SetValue( bool state );
-    bool GetValue() const;
-    
-    void SetLabel( const wxString& label );
-    void SetFont( const wxFont &font );
-    void Enable( bool enable );
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
 #endif // __GTKCHECKBOXH__