From 25c9f4394e678421cea4de3e2af3f1f6793e5fc6 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 10 Feb 2004 18:23:29 +0000
Subject: [PATCH] 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
---
 src/common/sizer.cpp | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 390c769e71..89d60066b9 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -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()