made wx[Array]TreeItemId[s] more backwards compatible

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

diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h
index e7c6e2f65ee8312693141c5df631283af1c18b0c..e1f9daff12ced138a4752b7980c8071e4c4ea921 100644 (file)
--- a/include/wx/univ/checkbox.h
+++ b/include/wx/univ/checkbox.h
@@ -6,14 +6,14 @@
 // Created:     07.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     07.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_CHECKBOX_H_
 #define _WX_UNIV_CHECKBOX_H_
 
 #ifdef __GNUG__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_CHECKBOX_H_
 #define _WX_UNIV_CHECKBOX_H_
 
 #ifdef __GNUG__

-    #pragma interface "checkbox.h"
+    #pragma interface "univcheckbox.h"

 #endif
 
 #include "wx/button.h" // for wxStdButtonInputHandler
 #endif
 
 #include "wx/button.h" // for wxStdButtonInputHandler


@@ -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_