Fixed OS/2 compilation problems.

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

diff --git a/include/wx/gtk1/checkbox.h b/include/wx/gtk1/checkbox.h
index 562f783397d99b21a7929aa2bba141f4e4fb59c7..0e8cf389b1d858cbabf30a55e5af310b83ed21f7 100644 (file)
--- a/include/wx/gtk1/checkbox.h
+++ b/include/wx/gtk1/checkbox.h
@@ -14,31 +14,11 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-
-#if wxUSE_CHECKBOX
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxCheckBox;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxCheckBoxNameStr;
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxCheckBox
 // wxCheckBox

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-class wxCheckBox: public wxControl
+class wxCheckBox : public wxCheckBoxBase

 {
 public:
     wxCheckBox();
 {
 public:
     wxCheckBox();


@@ -75,6 +55,8 @@ public:
     GtkWidget *m_widgetCheckbox;
     GtkWidget *m_widgetLabel;
     
     GtkWidget *m_widgetCheckbox;
     GtkWidget *m_widgetLabel;
     

+    bool       m_blockEvent;
+

 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;
 


@@ -82,6 +64,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 

-#endif
-

 #endif // __GTKCHECKBOXH__
 #endif // __GTKCHECKBOXH__