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
This commit is contained in:
@@ -66,8 +66,9 @@ wxSize wxStaticText::DoGetBestSize() const
|
|||||||
Point bounds ;
|
Point bounds ;
|
||||||
SInt16 baseline ;
|
SInt16 baseline ;
|
||||||
wxMacCFStringHolder str(m_label , m_font.GetEncoding() ) ;
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user