compilation fix for !MSVC

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

diff --git a/include/wx/gtk1/checkbox.h b/include/wx/gtk1/checkbox.h
index 562f783397d99b21a7929aa2bba141f4e4fb59c7..2d262a097823b7d3a19bad8d44f36936330cde32 100644 (file)
--- a/include/wx/gtk1/checkbox.h
+++ b/include/wx/gtk1/checkbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        checkbox.h
+// Name:        wx/gtk/checkbox.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -10,35 +10,15 @@
 #ifndef __GTKCHECKBOXH__
 #define __GTKCHECKBOXH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #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
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
-class wxCheckBox: public wxControl
+class wxCheckBox : public wxCheckBoxBase
 {
 public:
     wxCheckBox();
@@ -62,8 +42,8 @@ public:
     void SetValue( bool state );
     bool GetValue() const;
 
-    void SetLabel( const wxString& label );
-    bool Enable( bool enable );
+    virtual void SetLabel( const wxString& label );
+    virtual bool Enable( bool enable = TRUE );
 
     // implementation
     // --------------
@@ -74,7 +54,9 @@ public:
 
     GtkWidget *m_widgetCheckbox;
     GtkWidget *m_widgetLabel;
-    
+
+    bool       m_blockEvent;
+
 protected:
     virtual wxSize DoGetBestSize() const;
 
@@ -82,6 +64,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
-#endif
-
 #endif // __GTKCHECKBOXH__