X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aca78774b6aa0ab27dead3b4b88c0d8e40e5667a..d11e8786ed13b72766eea18cb577cc00f9f08f41:/include/wx/msw/radiobut.h diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h index ea577bca88..da92a8e18f 100644 --- a/include/wx/msw/radiobut.h +++ b/include/wx/msw/radiobut.h @@ -12,7 +12,7 @@ #ifndef _WX_RADIOBUT_H_ #define _WX_RADIOBUT_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "radiobut.h" #endif @@ -52,9 +52,9 @@ public: // implementation only from now on virtual bool MSWCommand(WXUINT param, WXWORD id); virtual void Command(wxCommandEvent& event); - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual void ApplyParentThemeBackground(const wxColour& bg) + { SetBackgroundColour(bg); } - virtual void SetFocus(); protected: virtual wxSize DoGetBestSize() const; @@ -63,10 +63,11 @@ private: // common part of all ctors void Init(); - // see the comments in SetFocus() - bool m_focusJustSet; + // we need to store the state internally as the result of GetValue() + // sometimes gets out of sync in WM_COMMAND handler + bool m_isChecked; - DECLARE_DYNAMIC_CLASS(wxRadioButton) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxRadioButton) }; #endif