layout adaption, current sizer code leads to too much white space

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/osx/statbox_osx.cpp

@@ -40,29 +40,18 @@ bool wxStaticBox::Create( wxWindow *parent,
 
 void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
 {
-    static int extraTop = -1; // Uninitted
+    static int extraTop = 11; 
-    static int other = 5;
+    static int other = 11;
-
-    if ( extraTop == -1 )
-    {
-        // The minimal border used for the top.
-        // Later on, the staticbox's font height is added to this.
-        extraTop = 0;
-
-        // 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;
-#if wxOSX_USE_COCOA
-        other = 17;
-#else
-        other = 11;
-#endif
-    }
 
     *borderTop = extraTop;
     if ( !m_label.empty() )
+    {
+#if wxOSX_USE_COCOA
+        *borderTop += 11;
+#else
         *borderTop += GetCharHeight();
+#endif
+    }
 
     *borderOther = other;
 }