X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0b5881aeaef69976ed1693ab0423187a8bcd53c..cc24bf919256e8e1d317dbb8e67df6d007d641ea:/src/msw/radiobut.cpp diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp index 5196c0ba05..dddab3e26a 100644 --- a/src/msw/radiobut.cpp +++ b/src/msw/radiobut.cpp @@ -297,7 +297,7 @@ wxSize wxRadioButton::DoGetBestSize() const int wRadio, hRadio; if ( !str.empty() ) { - GetTextExtent(wxStripMenuCodes(str), &wRadio, &hRadio); + GetTextExtent(GetLabelText(str), &wRadio, &hRadio); wRadio += s_radioSize + GetCharWidth(); if ( hRadio < s_radioSize ) @@ -314,4 +314,14 @@ wxSize wxRadioButton::DoGetBestSize() const return best; } +WXDWORD wxRadioButton::MSWGetStyle(long style, WXDWORD *exstyle) const +{ + WXDWORD styleMSW = wxControl::MSWGetStyle(style, exstyle); + + if ( style & wxRB_GROUP ) + styleMSW |= WS_GROUP; + + return styleMSW; +} + #endif // wxUSE_RADIOBTN