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

was incorrectly forcing the font to 12 in most cases, fixes #4745

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-06-27 09:50:08 +00:00
parent 922da38b89
commit cde80c9284
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osx/carbon/font.cpp
View File

@@ -316,7 +316,7 @@ static CTFontDescriptorRef wxMacCreateCTFontDescriptor(CFStringRef iFamilyName,
wxFontRefData::wxFontRefData( wxUint32 coreTextFontType ) wxFontRefData::wxFontRefData( wxUint32 coreTextFontType )
{ {
CTFontRef font = CTFontCreateUIFontForLanguage( coreTextFontType, 0.0, NULL ) ; CTFontRef font = CTFontCreateUIFontForLanguage( coreTextFontType, 0.0, NULL ) ;
if ( CTFontGetSize(m_ctFont) == 0 ) if ( CTFontGetSize(font) == 0 )
{ {
CFRelease(font); CFRelease(font);
font = CTFontCreateUIFontForLanguage( coreTextFontType, 12.0, NULL ); font = CTFontCreateUIFontForLanguage( coreTextFontType, 12.0, NULL );
@@ -446,7 +446,7 @@ void wxFontRefData::MacFindFont()
m_ctFont.reset( CTFontCreateWithFontDescriptor( m_ctFontDescriptor, m_pointSize, NULL ) ); m_ctFont.reset( CTFontCreateWithFontDescriptor( m_ctFontDescriptor, m_pointSize, NULL ) );
#endif #endif
} }
#if wxMAC_USE_ATSU_TEXT == 0 #if wxMAC_USE_ATSU_TEXT
OSStatus status = noErr; OSStatus status = noErr;
CTFontDescriptorRef desc = m_ctFontDescriptor ; CTFontDescriptorRef desc = m_ctFontDescriptor ;
ATSFontRef atsfont = CTFontGetPlatformFont( m_ctFont, &desc ); ATSFontRef atsfont = CTFontGetPlatformFont( m_ctFont, &desc );