Added wxDIRCTRL_EDITABLE style so we can choose whether

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

diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h
index e7c6e2f65ee8312693141c5df631283af1c18b0c..7d419022272dc52640a4a65dfdb248f71e2c9c49 100644 (file)
--- a/include/wx/univ/checkbox.h
+++ b/include/wx/univ/checkbox.h
@@ -13,7 +13,7 @@
 #define _WX_UNIV_CHECKBOX_H_
 
 #ifdef __GNUG__
-    #pragma interface "checkbox.h"
+    #pragma interface "univcheckbox.h"
 #endif
 
 #include "wx/button.h" // for wxStdButtonInputHandler
@@ -32,6 +32,11 @@
 // wxCheckBox
 // ----------------------------------------------------------------------------
 
+// X11 headers may define this
+#ifdef Status
+#undef Status
+#endif
+
 class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
 {
 public:
@@ -155,7 +160,7 @@ public:
 
     // we have to override this one as wxStdButtonInputHandler version works
     // only with the buttons
-    virtual bool HandleActivation(wxControl *control, bool activated);
+    virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);
 };
 
 #endif // _WX_UNIV_CHECKBOX_H_