X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8383e673b1d839548b7336947a61fa699eeb6621..7c60222510bc5e197b12f153c4bf05db66cb0f4a:/src/osx/statbox_osx.cpp

diff --git a/src/osx/statbox_osx.cpp b/src/osx/statbox_osx.cpp
index c093cd384f..fec97c5f45 100644
--- a/src/osx/statbox_osx.cpp
+++ b/src/osx/statbox_osx.cpp
@@ -23,15 +23,15 @@ bool wxStaticBox::Create( wxWindow *parent,
     const wxSize& size,
     long style,
     const wxString& name )
-{
-    m_macIsUserPane = false;
-
+{    
+    DontCreatePeer();
+    
     if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
         return false;
 
     m_labelOrig = m_label = label;
 
-    m_peer = wxWidgetImpl::CreateGroupBox( this, parent, id, label, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateGroupBox( this, parent, id, label, pos, size, style, GetExtraStyle() ));
 
     MacPostControlCreate( pos, size );
 
@@ -40,30 +40,19 @@ bool wxStaticBox::Create( wxWindow *parent,
 
 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
-        other = 17;
+        *borderTop += 11;
 #else
-        other = 11;
+        *borderTop += GetCharHeight();
 #endif
     }
 
-    *borderTop = extraTop;
-    if ( !m_label.empty() )
-        *borderTop += GetCharHeight();
-
     *borderOther = other;
 }