X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1f8726218e78cddbf47f9f00d8fe41dd73ce9e7..6cef0db28018fd2644ee4e38af715872e5242459:/src/mac/carbon/statbox.cpp

diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index d0e09ff227..398fc5fcb2 100644
--- a/src/mac/carbon/statbox.cpp
+++ b/src/mac/carbon/statbox.cpp
@@ -9,10 +9,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "statbox.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #if wxUSE_STATBOX
@@ -20,38 +16,35 @@
 #include "wx/statbox.h"
 #include "wx/mac/uma.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-#endif
-
-/*
- * Static box
- */
-
-bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+
+
+bool wxStaticBox::Create( wxWindow *parent,
+    wxWindowID id,
+    const wxString& label,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxString& name )
 {
-    m_macIsUserPane = FALSE ;
+    m_macIsUserPane = false;
 
-    if ( !wxControl::Create(parent, id, pos, size,
-                            style, wxDefaultValidator, name) )
+    if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
         return false;
 
-    m_label = label ;
+    m_labelOrig = m_label = label;
 
-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );
 
-    m_peer = new wxMacControl(this) ;
-    verify_noerr(CreateGroupBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, CFSTR("") ,
-        true /*primary*/ , m_peer->GetControlRefAddr() ) ) ;
+    m_peer = new wxMacControl( this );
+    OSStatus err = CreateGroupBoxControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, CFSTR(""),
+        true /*primary*/, m_peer->GetControlRefAddr() );
+    verify_noerr( err );
 
-    MacPostControlCreate(pos,size) ;
+    MacPostControlCreate( pos, size );
 
-    return TRUE;
+    return true;
 }
 
 void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
@@ -61,22 +54,21 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
 
     if ( extraTop == -1 )
     {
-        // The minimal border used for the top. Later on the staticbox'
-        // font height is added to this.
+        // The minimal border used for the top.
+        // Later on, the staticbox's font height is added to this.
         extraTop = 0;
 
-        if ( UMAGetSystemVersion() >= 0x1030 /*Panther*/ )
-        {
-            // 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;
-        }
-
+        // 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 + GetCharHeight();
+    *borderTop = extraTop;
+    if ( !m_label.empty() )
+        *borderTop += GetCharHeight();
+
     *borderOther = other;
 }