X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f469584d643a59dab4545bb95020bf6188af1d69..a45d2855c6882edc830777de2cec9ac21caced61:/src/msw/radiobut.cpp diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp index e88d6d7829..42bbdc43e5 100644 --- a/src/msw/radiobut.cpp +++ b/src/msw/radiobut.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "radiobut.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -300,7 +296,7 @@ wxSize wxRadioButton::DoGetBestSize() const int wRadio, hRadio; if ( !str.empty() ) { - GetTextExtent(str, &wRadio, &hRadio); + GetTextExtent(wxStripMenuCodes(str), &wRadio, &hRadio); wRadio += s_radioSize + GetCharWidth(); if ( hRadio < s_radioSize ) @@ -312,7 +308,9 @@ wxSize wxRadioButton::DoGetBestSize() const hRadio = s_radioSize; } - return wxSize(wRadio, hRadio); + wxSize best(wRadio, hRadio); + CacheBestSize(best); + return best; } #endif // wxUSE_RADIOBTN