X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/442b35b53bf95f5c6c003ea9ddbefd17adbc2a00..6a8b0d458663e48152afcf6576a057f5b8ab8be3:/include/wx/univ/checkbox.h diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h index 437ec78b10..c7aa666d15 100644 --- a/include/wx/univ/checkbox.h +++ b/include/wx/univ/checkbox.h @@ -6,13 +6,13 @@ // 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__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "univcheckbox.h" #endif @@ -22,8 +22,8 @@ // the actions supported by wxCheckBox // ---------------------------------------------------------------------------- -#define wxACTION_CHECKBOX_CHECK _T("check") // SetValue(TRUE) -#define wxACTION_CHECKBOX_CLEAR _T("clear") // SetValue(FALSE) +#define wxACTION_CHECKBOX_CHECK _T("check") // SetValue(true) +#define wxACTION_CHECKBOX_CLEAR _T("clear") // SetValue(false) #define wxACTION_CHECKBOX_TOGGLE _T("toggle") // toggle the check state // additionally it accepts wxACTION_BUTTON_PRESS and RELEASE @@ -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, @@ -103,7 +110,7 @@ protected: virtual void DoDraw(wxControlRenderer *renderer); virtual wxSize DoGetBestClientSize() const; - virtual bool CanBeHighlighted() const { return TRUE; } + virtual bool CanBeHighlighted() const { return true; } // get the size of the bitmap using either the current one or the default // one (query renderer then) @@ -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_