moved win_gtk.h header to wx/gtk/private, it's for internal use only

[wxWidgets.git] / src / mac / carbon / statbox.cpp

diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index cb3b47de9080ca6f8c5424ed88aabdd988802076..398fc5fcb2fa2e334f52cdac09170651d6d423f3 100644 (file)
--- a/src/mac/carbon/statbox.cpp
+++ b/src/mac/carbon/statbox.cpp
@@ -32,7 +32,7 @@ bool wxStaticBox::Create( wxWindow *parent,
     if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
         return false;
 
     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 );
 


@@ -58,17 +58,17 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
         // Later on, the staticbox's font height is added to this.
         extraTop = 0;
 
         // 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;
 }
 
     *borderOther = other;
 }