X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aca78774b6aa0ab27dead3b4b88c0d8e40e5667a..7344108e8a129a3f9b4df5ab0f98a1713db03b89:/include/wx/msw/radiobut.h diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h index ea577bca88..47bde0578a 100644 --- a/include/wx/msw/radiobut.h +++ b/include/wx/msw/radiobut.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobut.h +// Name: wx/msw/radiobut.h // Purpose: wxRadioButton class // Author: Julian Smart // Modified by: @@ -12,11 +12,7 @@ #ifndef _WX_RADIOBUT_H_ #define _WX_RADIOBUT_H_ -#ifdef __GNUG__ - #pragma interface "radiobut.h" -#endif - -class WXDLLEXPORT wxRadioButton: public wxControl +class WXDLLIMPEXP_CORE wxRadioButton: public wxControl { public: // ctors and creation functions @@ -52,21 +48,23 @@ 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 bool HasTransparentBackground() { return true; } - virtual void SetFocus(); + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; protected: + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } virtual wxSize DoGetBestSize() const; 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