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

Added space under label since it was too close to first radio button.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-07-08 20:58:06 +00:00
parent 9dfaa4733c
commit c7fd6717af
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/msw/radiobox.cpp
View File

@@ -413,15 +413,21 @@ wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const
int extraHeight = cy1; int extraHeight = cy1;
/* We'll assume the adjustments below are OK for Win 3.1 too
#if defined(CTL3D) && !CTL3D #if defined(CTL3D) && !CTL3D
// Requires a bigger group box in plain Windows // Requires a bigger group box in plain Windows
extraHeight *= 3; extraHeight *= 3;
extraHeight /= 2; extraHeight /= 2;
#endif #endif
*/
int height = GetNumVer() * sizeBtn.y + cy1/2 + extraHeight; int height = GetNumVer() * sizeBtn.y + cy1/2 + extraHeight;
int width = GetNumHor() * (sizeBtn.x + cx1) + cx1; int width = GetNumHor() * (sizeBtn.x + cx1) + cx1;
// Add extra space under the label, if it exists.
if (!wxControl::GetLabel().IsEmpty())
height += cy1/2;
// and also wide enough for its label // and also wide enough for its label
int widthLabel; int widthLabel;
GetTextExtent(GetTitle(), &widthLabel, NULL); GetTextExtent(GetTitle(), &widthLabel, NULL);
@@ -507,10 +513,9 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
x_offset += cx1; x_offset += cx1;
y_offset += cy1; y_offset += cy1;
#if defined(CTL3D) && (!CTL3D) // Add extra space under the label, if it exists.
y_offset += (int)(cy1/2); // Fudge factor since buttons overlapped label if (!wxControl::GetLabel().IsEmpty())
// JACS 2/12/93. CTL3D draws group label quite high. y_offset += cy1/2;
#endif
int startX = x_offset; int startX = x_offset;
int startY = y_offset; int startY = y_offset;