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

diff --git a/src/osx/statbox_osx.cpp b/src/osx/statbox_osx.cpp
index 0d9c91c62976f7aab7a343200c36dc116ef5c13d..fec97c5f4563aaa8f471edf09f348cbf1363af21 100644 (file)
--- a/src/osx/statbox_osx.cpp
+++ b/src/osx/statbox_osx.cpp
@@ -40,30 +40,19 @@ bool wxStaticBox::Create( wxWindow *parent,
 
 void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
 {
 
 void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
 {

-    static int extraTop = -1; // Uninitted
-    static int other = 5;
+    static int extraTop = 11; 
+    static int other = 11;

 
 

-    if ( extraTop == -1 )
+    *borderTop = extraTop;
+    if ( !m_label.empty() )

     {
     {

-        // 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
 #if wxOSX_USE_COCOA

-        other = 17;
+        *borderTop += 11;

 #else
 #else

-        other = 11;
+        *borderTop += GetCharHeight();

 #endif
     }
 
 #endif
     }
 

-    *borderTop = extraTop;
-    if ( !m_label.empty() )
-        *borderTop += GetCharHeight();
-

     *borderOther = other;
 }
 
     *borderOther = other;
 }