X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..a315cec9685964e73d833f4c8cf6b38828780899:/include/wx/univ/checkbox.h diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h index 05bf1d14ae..7d41902227 100644 --- a/include/wx/univ/checkbox.h +++ b/include/wx/univ/checkbox.h @@ -5,7 +5,7 @@ // Modified by: // Created: 07.09.00 // RCS-ID: $Id$ -// Copyright: (c) 2000 Vadim Zeitlin +// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows license /////////////////////////////////////////////////////////////////////////////// @@ -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_