More OS/2 stubs and caret fix

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

diff --git a/include/wx/gtk1/checkbox.h b/include/wx/gtk1/checkbox.h
index 0f95924e1b64828c7f3381f8c01303218faece8d..f26be094c84bf55db0a34d6e15d56115a5abec8c 100644 (file)
--- a/include/wx/gtk1/checkbox.h
+++ b/include/wx/gtk1/checkbox.h
@@ -2,10 +2,9 @@
 // Name:        checkbox.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        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

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -17,6 +16,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_CHECKBOX
+

 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"


@@ -39,19 +41,40 @@ extern const char *wxCheckBoxNameStr;
 
 class wxCheckBox: public wxControl
 {
 
 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;
+DECLARE_DYNAMIC_CLASS(wxCheckBox)
+
+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;
+
+    void SetLabel( const wxString& label );
+    bool Enable( bool enable );
+
+    // implementation
+    void ApplyWidgetStyle();
+
+    GtkWidget *m_widgetCheckbox;
+    GtkWidget *m_widgetLabel;

 };
 
 };
 

+#endif
+

 #endif // __GTKCHECKBOXH__
 #endif // __GTKCHECKBOXH__