Refactoring: no real changes.

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

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index 0f95924e1b64828c7f3381f8c01303218faece8d..11f89e0a478bf38870c26fc7f69bc8554d685671 100644 (file)
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -1,57 +1,67 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        checkbox.h
+// Name:        wx/gtk/checkbox.h

 // Purpose:
 // Author:      Robert Roebling
 // 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__
 
 #ifndef __GTKCHECKBOXH__
 #define __GTKCHECKBOXH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #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 );

 
 

-class wxCheckBox;
+    void SetValue( bool state );
+    bool GetValue() const;

 
 

-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+    virtual void SetLabel( const wxString& label );
+    virtual bool Enable( bool enable = TRUE );

 
 

-extern const char *wxCheckBoxNameStr;
+    // implementation
+    // --------------

 
 

-//-----------------------------------------------------------------------------
-// wxCheckBox
-//-----------------------------------------------------------------------------
+    void ApplyWidgetStyle();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void OnInternalIdle();

 
 

-class wxCheckBox: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxCheckBox)
-
-  public:
-
-    wxCheckBox(void);
-    wxCheckBox( wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = 0, const wxString &name = wxCheckBoxNameStr  );
-    bool Create(  wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = 0, const wxString &name = wxCheckBoxNameStr  );
-    void SetValue( const bool state );
-    bool GetValue(void) const;
+    GtkWidget *m_widgetCheckbox;
+    GtkWidget *m_widgetLabel;
+
+    bool       m_blockEvent;
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckBox)

 };
 
 #endif // __GTKCHECKBOXH__
 };
 
 #endif // __GTKCHECKBOXH__