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

Using ‚old‘ constant names, so that SDK 10.7 compilation is still possible

Browse Source
This commit is contained in:
Stefan Csomor
2019-04-19 10:48:54 +02:00
parent f8bdd27164
commit 26949ce886
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

@@ -793,11 +793,11 @@ void wxNativeFontInfo::InitFromFontDescriptor(CTFontDescriptorRef desc)
wxCFDictionaryRef traits((CFDictionaryRef)CTFontDescriptorCopyAttribute(desc, kCTFontTraitsAttribute)); wxCFDictionaryRef traits((CFDictionaryRef)CTFontDescriptorCopyAttribute(desc, kCTFontTraitsAttribute));
traits.GetValue(kCTFontSymbolicTrait).GetValue((int32_t*)&symbolicTraits, 0); traits.GetValue(kCTFontSymbolicTrait).GetValue((int32_t*)&symbolicTraits, 0);
if (symbolicTraits & kCTFontTraitMonoSpace) if (symbolicTraits & kCTFontMonoSpaceTrait)
m_family = wxFONTFAMILY_TELETYPE; m_family = wxFONTFAMILY_TELETYPE;
else else
{ {
uint32_t stylisticClass = symbolicTraits & kCTFontTraitClassMask; uint32_t stylisticClass = symbolicTraits & kCTFontClassMaskTrait;
if (stylisticClass == kCTFontSansSerifClass) if (stylisticClass == kCTFontSansSerifClass)
m_family = wxFONTFAMILY_SWISS; m_family = wxFONTFAMILY_SWISS;