panther fixes for static box distances

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@25713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-02-10 18:23:29 +00:00
parent 314bbbacb3
commit 25c9f4394e

View File

@@ -1231,6 +1231,36 @@ static void GetStaticBoxBorders(wxStaticBox *box,
{
// this has to be done platform by platform as there is no way to
// guess the thickness of a wxStaticBox border
#if defined(__WXMAC__)
static int extraTop = -1; // Uninitted
static int other = 5;
if ( extraTop == -1 )
{
int verMaj, verMin;
(void) ::wxGetOsVersion(&verMaj, &verMin);
// The minimal border used for the top. Later on the staticbox'
// font height is added to this.
extraTop = 0;
// Is the Mac OS version OS X Panther or higher?
if ( ((verMaj << 16) + verMin) >= 0x00100030 )
{
// As indicated by the HIG, Panther needs an extra border of 11
// pixels (otherwise overlapping occurs at the top). The "other"
// border has to be 11.
extraTop = 11;
other = 11;
}
}
*borderTop = extraTop + box->GetCharHeight();
*borderOther = other;
#else
#ifdef __WXGTK__
if ( box->GetLabel().IsEmpty() )
*borderTop = 5;
@@ -1239,6 +1269,7 @@ static void GetStaticBoxBorders(wxStaticBox *box,
*borderTop = box->GetCharHeight();
*borderOther = 5;
#endif
}
void wxStaticBoxSizer::RecalcSizes()