X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b2a5a8cbe186fbb9b4522d169d9fe4320b9ec42..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/checkbox.h?ds=sidebyside diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h index 47a4e356d5..0fa2516ca3 100644 --- a/include/wx/checkbox.h +++ b/include/wx/checkbox.h @@ -5,7 +5,7 @@ // Modified by: // Created: 07.09.00 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -49,7 +49,7 @@ enum wxCheckBoxState }; -WXDLLEXPORT_DATA(extern const wxChar *) wxCheckBoxNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[]; // ---------------------------------------------------------------------------- // wxCheckBox: a control which shows a label and a box which may be checked @@ -99,19 +99,25 @@ public: DoSet3StateValue(state); } - bool Is3State() const + bool Is3State() const { return HasFlag(wxCHK_3STATE); } + + bool Is3rdStateAllowedForUser() const { - return (m_style & wxCHK_3STATE) != 0; + return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER); } - bool Is3rdStateAllowedForUser() const + virtual bool HasTransparentBackground() { return true; } + + // wxCheckBox-specific processing after processing the update event + virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) { - return (m_style & wxCHK_ALLOW_3RD_STATE_FOR_USER) != 0; + wxControl::DoUpdateWindowUI(event); + + if ( event.GetSetChecked() ) + SetValue(event.GetChecked()); } protected: - int m_style; - virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; } virtual wxCheckBoxState DoGet3StateValue() const @@ -130,14 +136,18 @@ private: #include "wx/msw/checkbox.h" #elif defined(__WXMOTIF__) #include "wx/motif/checkbox.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/checkbox.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/checkbox.h" #elif defined(__WXMAC__) #include "wx/mac/checkbox.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/checkbox.h" #elif defined(__WXPM__) #include "wx/os2/checkbox.h" +#elif defined(__WXPALMOS__) + #include "wx/palmos/checkbox.h" #endif #endif // wxUSE_CHECKBOX