don't add extra GetCharHeight() pixels to the top border if our label is empty (patch...

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 58847946242d8057a927436caac457cf988f7b74..fa3decc304f493e670ca91b99ad33ed5a1e7f7fd 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -56,6 +56,13 @@ wxMSW:
 - Return the restored window size from GetSize() when window is minimized.
 
 
+2.8.3
+-----
+
+wxMac
+
+- Corrected top border size for wxStaticBox with empty label (nusi)
+
 2.8.2
 -----
 

diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index cb3b47de9080ca6f8c5424ed88aabdd988802076..53dfd546351fe5bf588c804dcef97a56929e3fa9 100644 (file)
--- a/src/mac/carbon/statbox.cpp
+++ b/src/mac/carbon/statbox.cpp
@@ -68,7 +68,10 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
         }
     }
 
-    *borderTop = extraTop + GetCharHeight();
+    *borderTop = extraTop;
+    if ( !m_label.empty() )
+        *borderTop += GetCharHeight();
+
     *borderOther = other;
 }