Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

supporting non-theme fonts

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-04-02 08:29:26 +00:00
parent c1d19dfb68
commit 943b730f1f
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mac/carbon/stattext.cpp
View File

@@ -66,7 +66,16 @@ 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( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , m_font.MacGetThemeFontID() , kThemeStateActive , false , &bounds , &baseline ) ) ; if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
verify_noerr( GetThemeTextDimensions( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , m_font.MacGetThemeFontID() , kThemeStateActive , false , &bounds , &baseline ) ) ;
else
{
wxMacWindowStateSaver sv( this ) ;
::TextFont( m_font.MacGetFontNum() ) ;
::TextSize( (short)( m_font.MacGetFontSize()) ) ;
::TextFace( m_font.MacGetFontStyle() ) ;
verify_noerr( GetThemeTextDimensions( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , kThemeCurrentPortFont , kThemeStateActive , false , &bounds , &baseline ) ) ;
}
if ( m_label.Length() == 0 ) if ( m_label.Length() == 0 )
bounds.h = 0 ; bounds.h = 0 ;
return wxSize(bounds.h, bounds.v); return wxSize(bounds.h, bounds.v);