weak link test is not optimal, as CoreText is already having some symbols defined under 10.4, replace with fixed system number test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
#include "wx/fontutil.h"
|
||||
#include "wx/graphics.h"
|
||||
|
||||
#include "wx/mac/private.h"
|
||||
#include "wx/mac/uma.h"
|
||||
|
||||
#ifndef __DARWIN__
|
||||
#include <ATSUnicode.h>
|
||||
@@ -235,7 +235,7 @@ void wxFontRefData::MacFindFont()
|
||||
OSStatus status = noErr;
|
||||
|
||||
#if wxMAC_USE_CORE_TEXT
|
||||
if ( CTFontCreateWithName != NULL )
|
||||
if ( UMAGetSystemVersion() >= 0x1050 )
|
||||
{
|
||||
if ( m_faceName.empty() && m_family == wxDEFAULT && m_macUIFontType == kCTFontNoFontType )
|
||||
{
|
||||
@@ -517,7 +517,7 @@ bool wxFont::MacCreateUIFont(wxUint32 ctFontType )
|
||||
bool wxFont::MacCreateThemeFont(wxUint16 themeFontID)
|
||||
{
|
||||
#if wxMAC_USE_CORE_TEXT
|
||||
if ( HIThemeGetUIFontType != NULL )
|
||||
if ( UMAGetSystemVersion() >= 0x1050)
|
||||
{
|
||||
return MacCreateUIFont(HIThemeGetUIFontType(themeFontID));
|
||||
}
|
||||
|
Reference in New Issue
Block a user