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 3737b9eb952b38de45bd2addc37a15420db12e91..f26be094c84bf55db0a34d6e15d56115a5abec8c 100644 (file)
--- a/include/wx/gtk1/checkbox.h
+++ b/include/wx/gtk1/checkbox.h
@@ -16,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"


@@ -41,7 +44,7 @@ class wxCheckBox: public wxControl
 DECLARE_DYNAMIC_CLASS(wxCheckBox)
 
 public:
 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,
     wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,


@@ -50,22 +53,28 @@ public:
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
     {
         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 SetValue( bool state );
     bool GetValue() const;
 
     void SetLabel( const wxString& label );

-    void Enable( bool enable );
+    bool Enable( bool enable );

 
     // implementation
 
     // implementation

-

     void ApplyWidgetStyle();
 
     void ApplyWidgetStyle();
 

-    bool   m_blockFirstEvent;
+    GtkWidget *m_widgetCheckbox;
+    GtkWidget *m_widgetLabel;

 };
 
 };
 

+#endif
+

 #endif // __GTKCHECKBOXH__
 #endif // __GTKCHECKBOXH__