X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6670f56440ae9209b3e2e51e06acf3bc5aaf1905..0f4c3aa2ccb4e4a1cb43a71ff693256386ac24b6:/src/os2/radiobut.cpp diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp index 61fd55f4b0..7134de72b4 100644 --- a/src/os2/radiobut.cpp +++ b/src/os2/radiobut.cpp @@ -111,17 +111,11 @@ bool wxRadioButton::Create( wxSize wxRadioButton::DoGetBestSize() const { - static int snRadioSize = 0; + // We should probably compute snRadioSize but it seems to be a constant + // independent of its label's font size and not made available by OS/2. + static int snRadioSize = RADIO_SIZE; - if (!snRadioSize) - { - wxScreenDC vDC; - - vDC.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - snRadioSize = vDC.GetCharHeight(); - } - - wxString sStr = GetLabel(); + wxString sStr = wxGetWindowText(GetHwnd()); int nRadioWidth; int nRadioHeight; @@ -131,7 +125,7 @@ wxSize wxRadioButton::DoGetBestSize() const ,&nRadioWidth ,&nRadioHeight ); - nRadioWidth += snRadioSize + GetCharWidth(); + nRadioWidth += snRadioSize; if (nRadioHeight < snRadioSize) nRadioHeight = snRadioSize; }