Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch #1198422 (CheckBox labels being truncated).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2005-11-27 21:30:40 +00:00
parent 9630cac5fc
commit c5f975dddb
4 changed files with 25 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/os2/checkbox.cpp
View File

@@ -108,22 +108,9 @@ void wxCheckBox::SetLabel(
wxSize wxCheckBox::DoGetBestSize() const
{
static int nCheckSize = 0;
if (!nCheckSize)
{
wxScreenDC vDc;
vDc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
//
// The height of a standard button in the dialog units is 8,
// translate this to pixels (as one dialog unit is precisely equal to
// 8 character heights, it's just the char height)
//
nCheckSize = vDc.GetCharHeight();
}
// We should probably compute nCheckSize but it seems to be a constant
// independent of its label's font size and not made available by OS/2.
int nCheckSize = RADIO_SIZE;
int nWidthCheckbox;
int nHeightCheckbox;
wxString sStr = wxGetWindowText(GetHWND());
@@ -134,7 +121,7 @@ wxSize wxCheckBox::DoGetBestSize() const
,&nWidthCheckbox
,&nHeightCheckbox
);
nWidthCheckbox += nCheckSize + GetCharWidth();
nWidthCheckbox += nCheckSize;
if (nHeightCheckbox < nCheckSize)
nHeightCheckbox = nCheckSize;