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

weak link test is not optimal, as CoreText is already having some symbols defined under 10.4, replace with fixed system number test

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-11-30 08:19:44 +00:00
parent b81f668c1b
commit b3c1d21c7f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mac/carbon/font.cpp
View File

@@ -24,7 +24,7 @@
#include "wx/fontutil.h" #include "wx/fontutil.h"
#include "wx/graphics.h" #include "wx/graphics.h"
#include "wx/mac/private.h" #include "wx/mac/uma.h"
#ifndef __DARWIN__ #ifndef __DARWIN__
#include <ATSUnicode.h> #include <ATSUnicode.h>
@@ -235,7 +235,7 @@ void wxFontRefData::MacFindFont()
OSStatus status = noErr; OSStatus status = noErr;
#if wxMAC_USE_CORE_TEXT #if wxMAC_USE_CORE_TEXT
if ( CTFontCreateWithName != NULL ) if ( UMAGetSystemVersion() >= 0x1050 )
{ {
if ( m_faceName.empty() && m_family == wxDEFAULT && m_macUIFontType == kCTFontNoFontType ) if ( m_faceName.empty() && m_family == wxDEFAULT && m_macUIFontType == kCTFontNoFontType )
{ {
@@ -517,7 +517,7 @@ bool wxFont::MacCreateUIFont(wxUint32 ctFontType )
bool wxFont::MacCreateThemeFont(wxUint16 themeFontID) bool wxFont::MacCreateThemeFont(wxUint16 themeFontID)
{ {
#if wxMAC_USE_CORE_TEXT #if wxMAC_USE_CORE_TEXT
if ( HIThemeGetUIFontType != NULL ) if ( UMAGetSystemVersion() >= 0x1050)
{ {
return MacCreateUIFont(HIThemeGetUIFontType(themeFontID)); return MacCreateUIFont(HIThemeGetUIFontType(themeFontID));
} }