Compilation fixes for Nano-X

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

diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h
index 437ec78b109de128e1fe70b75597ffe86680c19d..7d419022272dc52640a4a65dfdb248f71e2c9c49 100644 (file)
--- a/include/wx/univ/checkbox.h
+++ b/include/wx/univ/checkbox.h
@@ -32,6 +32,11 @@
 // wxCheckBox
 // ----------------------------------------------------------------------------
 
 // wxCheckBox
 // ----------------------------------------------------------------------------
 

+// X11 headers may define this
+#ifdef Status
+#undef Status
+#endif
+

 class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
 {
 public:
 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
 
     // 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_
 };
 
 #endif // _WX_UNIV_CHECKBOX_H_