From c16a383314612020b83d900c5ada1b8e82938816 Mon Sep 17 00:00:00 2001 From: Oli Larkin Date: Tue, 24 Jan 2017 22:17:40 +0000 Subject: [PATCH] [SWELL] SWELL_GDI_GetOSXVersion() CStringToNSString() in swell-gdi.mm --- WDL/swell/swell-gdi.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WDL/swell/swell-gdi.mm b/WDL/swell/swell-gdi.mm index 73b32c00..4b0fa119 100644 --- a/WDL/swell/swell-gdi.mm +++ b/WDL/swell/swell-gdi.mm @@ -1881,7 +1881,7 @@ int ImageList_Add(HIMAGELIST list, HBITMAP image, HBITMAP mask) int AddFontResourceEx(LPCTSTR str, DWORD fl, void *pdv) { - if (SWELL_GetOSXVersion() < 0x1060) return 0; + if (SWELL_GDI_GetOSXVersion() < 0x1060) return 0; static bool l; static bool (*_CTFontManagerRegisterFontsForURL)( CFURLRef fontURL, uint32_t scope, CFErrorRef *error ); if (!l) @@ -1897,7 +1897,7 @@ int AddFontResourceEx(LPCTSTR str, DWORD fl, void *pdv) if (!_CTFontManagerRegisterFontsForURL) return 0; - CFStringRef s=(CFStringRef)SWELL_CStringToCFString(str); + CFStringRef s=(CFStringRef)CStringToNSString(str); CFURLRef r=CFURLCreateWithFileSystemPath(NULL,s,kCFURLPOSIXPathStyle,true); CFErrorRef err=NULL; -- 2.11.4.GIT