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

panther adjustements in size

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-01-25 15:13:45 +00:00
parent 1ed1a60984
commit 5d8fbe213c
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mac/carbon/radiobox.cpp
View File

@@ -452,6 +452,11 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
x_start = charWidth; x_start = charWidth;
y_start = 15 ; y_start = 15 ;
if ( UMAGetSystemVersion() >= 0x1030 )
{
//need to add a few more pixels for the top border on panther
y_start = y_start + 5; //how many exactly should this be to meet the HIG?
}
x_offset = x_start; x_offset = x_start;
y_offset = y_start; y_offset = y_start;
@@ -509,6 +514,11 @@ wxSize wxRadioBox::DoGetBestSize() const
totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight ; totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight ;
totWidth = GetColumnCount() * (maxWidth + charWidth) + charWidth; totWidth = GetColumnCount() * (maxWidth + charWidth) + charWidth;
if ( UMAGetSystemVersion() >= 0x1030 )
{
//need to add a few more pixels for the static boxborder on panther
totHeight = totHeight + 10; //how many exactly should this be to meet the HIG?
}
// handle radio box title as well // handle radio box title as well
GetTextExtent(GetTitle(), &eachWidth, NULL); GetTextExtent(GetTitle(), &eachWidth, NULL);
eachWidth = (int)(eachWidth + RADIO_SIZE) + 3 * charWidth ; eachWidth = (int)(eachWidth + RADIO_SIZE) + 3 * charWidth ;

10
src/mac/radiobox.cpp
View File

@@ -452,6 +452,11 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
x_start = charWidth; x_start = charWidth;
y_start = 15 ; y_start = 15 ;
if ( UMAGetSystemVersion() >= 0x1030 )
{
//need to add a few more pixels for the top border on panther
y_start = y_start + 5; //how many exactly should this be to meet the HIG?
}
x_offset = x_start; x_offset = x_start;
y_offset = y_start; y_offset = y_start;
@@ -509,6 +514,11 @@ wxSize wxRadioBox::DoGetBestSize() const
totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight ; totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight ;
totWidth = GetColumnCount() * (maxWidth + charWidth) + charWidth; totWidth = GetColumnCount() * (maxWidth + charWidth) + charWidth;
if ( UMAGetSystemVersion() >= 0x1030 )
{
//need to add a few more pixels for the static boxborder on panther
totHeight = totHeight + 10; //how many exactly should this be to meet the HIG?
}
// handle radio box title as well // handle radio box title as well
GetTextExtent(GetTitle(), &eachWidth, NULL); GetTextExtent(GetTitle(), &eachWidth, NULL);
eachWidth = (int)(eachWidth + RADIO_SIZE) + 3 * charWidth ; eachWidth = (int)(eachWidth + RADIO_SIZE) + 3 * charWidth ;