experimental --inplace flag implementation

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

diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h
index 437ec78b109de128e1fe70b75597ffe86680c19d..db3eadda07de66319c36883c800ff953ce230cf1 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:


@@ -96,6 +101,8 @@ public:
     // overridden base class virtuals
     virtual bool IsPressed() const { return m_isPressed; }
 
     // overridden base class virtuals
     virtual bool IsPressed() const { return m_isPressed; }
 

+    virtual bool HasTransparentBackground() { return TRUE; }
+    

 protected:
     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = -1,
 protected:
     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = -1,


@@ -155,7 +162,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_