X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bdb5436554c910fe850db1470514ee83ded76db3..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/checkbox.h?ds=sidebyside diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h index 9f9b5e83d9..0fa2516ca3 100644 --- a/include/wx/checkbox.h +++ b/include/wx/checkbox.h @@ -49,7 +49,7 @@ enum wxCheckBoxState }; -extern WXDLLEXPORT_DATA(const wxChar *) wxCheckBoxNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[]; // ---------------------------------------------------------------------------- // wxCheckBox: a control which shows a label and a box which may be checked @@ -108,6 +108,15 @@ public: 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; } @@ -127,8 +136,10 @@ 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__)