X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71908213057690d5452f72b2b9c8e62b53357170..af17155e907c863dbba2bbf1c6a91a083569404c:/include/wx/univ/checkbox.h diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h index e7c6e2f65e..b37ff5b637 100644 --- 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) -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_UNIV_CHECKBOX_H_ #define _WX_UNIV_CHECKBOX_H_ -#ifdef __GNUG__ - #pragma interface "checkbox.h" +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) + #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: @@ -96,6 +101,8 @@ public: // 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, @@ -155,7 +162,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_