From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Thu, 10 Mar 2011 18:56:58 +0000 (+0000)
Subject: under cocoa a too-small static box leads to erroneous layout information, therefore... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8383e673b1d839548b7336947a61fa699eeb6621

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

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

diff --git a/src/osx/statbox_osx.cpp b/src/osx/statbox_osx.cpp
index c20d08e086..c093cd384f 100644
--- a/src/osx/statbox_osx.cpp
+++ b/src/osx/statbox_osx.cpp
@@ -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)