fix for get best size when having empty labels

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 8437b9d5d131db89bc3a0c19537767aa0ac32532..c6a6dd4e1a5d430e43e8f5b770f2422f9b65bfdd 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -66,8 +66,9 @@ wxSize wxStaticText::DoGetBestSize() const
     Point bounds ;
     SInt16 baseline ;
     wxMacCFStringHolder str(m_label ,  m_font.GetEncoding() ) ;
     Point bounds ;
     SInt16 baseline ;
     wxMacCFStringHolder str(m_label ,  m_font.GetEncoding() ) ;

-    verify_noerr( GetThemeTextDimensions( str , m_font.MacGetThemeFontID() , kThemeStateActive , false , &bounds , &baseline ) ) ;
-
+    verify_noerr( GetThemeTextDimensions( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , m_font.MacGetThemeFontID() , kThemeStateActive , false , &bounds , &baseline ) ) ;
+    if ( m_label.Length() == 0 )
+        bounds.h = 0 ;

     return wxSize(bounds.h, bounds.v);
 }
 
     return wxSize(bounds.h, bounds.v);
 }