From: Vadim Zeitlin Date: Wed, 14 Mar 2007 00:25:20 +0000 (+0000) Subject: don't add extra GetCharHeight() pixels to the top border if our label is empty (patch... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6fa2dd0eb9a1d39f0e0f84088a6822858fcce4c6?ds=inline don't add extra GetCharHeight() pixels to the top border if our label is empty (patch 1581459) 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 5884794624..fa3decc304 100644 --- 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 cb3b47de90..53dfd54635 100644 --- 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; }