X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..c59abe0376cf9d488b8ea1ae49fa2858c4057cc5:/include/wx/checkbox.h diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h index dc333f37e8..0fa2516ca3 100644 --- a/include/wx/checkbox.h +++ b/include/wx/checkbox.h @@ -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 @@ -106,8 +106,16 @@ public: return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER); } - virtual void ApplyParentThemeBackground(const wxColour& bg) - { SetBackgroundColour(bg); } + virtual bool HasTransparentBackground() { return true; } + + // wxCheckBox-specific processing after processing the update event + virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) + { + wxControl::DoUpdateWindowUI(event); + + if ( event.GetSetChecked() ) + SetValue(event.GetChecked()); + } protected: virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; } @@ -128,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