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

under cocoa a too-small static box leads to erroneous layout information, therefore use fixed code layout info, fixes #13006

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2011-03-10 18:56:58 +00:00
parent bda7c3535e
commit 8383e673b1
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/osx/statbox_osx.cpp
View File

@ -40,12 +40,6 @@ bool wxStaticBox::Create( wxWindow *parent,
void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
{
#if wxOSX_USE_COCOA
int l,t,w,h;
m_peer->GetContentArea(l, t, w, h);
*borderTop = t + 10;
*borderOther = l + 10;
#else
static int extraTop = -1; // Uninitted
static int other = 5;
@ -59,7 +53,11 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
// pixels (otherwise overlapping occurs at the top). The "other"
// border has to be 11.
extraTop = 11;
#if wxOSX_USE_COCOA
other = 17;
#else
other = 11;
#endif
}
*borderTop = extraTop;
@ -67,7 +65,6 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
*borderTop += GetCharHeight();
*borderOther = other;
#endif
}
bool wxStaticBox::SetFont(const wxFont& font)