From 046fde85804824b68d2b9525b3b7cabc7a0f708b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 27 Aug 2021 00:08:18 +0200 Subject: [PATCH] Use non-deprecated CTFontUIFontType constants Use "new" (available since 10.5, for most part) values of the enum instead of the deprecated ones, which are still defined, but might not be in the future. No real changes. --- src/osx/carbon/font.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp index 2e0a063396..4535b3c9e6 100644 --- a/src/osx/carbon/font.cpp +++ b/src/osx/carbon/font.cpp @@ -487,28 +487,28 @@ public: wxFALLTHROUGH; case wxOSX_SYSTEM_FONT_NORMAL: - uifont = kCTFontSystemFontType; + uifont = kCTFontUIFontSystem; break; case wxOSX_SYSTEM_FONT_BOLD: - uifont = kCTFontEmphasizedSystemFontType; + uifont = kCTFontUIFontEmphasizedSystem; break; case wxOSX_SYSTEM_FONT_SMALL: - uifont = kCTFontSmallSystemFontType; + uifont = kCTFontUIFontSmallSystem; break; case wxOSX_SYSTEM_FONT_SMALL_BOLD: - uifont = kCTFontSmallEmphasizedSystemFontType; + uifont = kCTFontUIFontSmallEmphasizedSystem; break; case wxOSX_SYSTEM_FONT_MINI: - uifont = kCTFontMiniSystemFontType; + uifont = kCTFontUIFontMiniSystem; break; case wxOSX_SYSTEM_FONT_MINI_BOLD: - uifont = kCTFontMiniEmphasizedSystemFontType; + uifont = kCTFontUIFontMiniEmphasizedSystem; break; case wxOSX_SYSTEM_FONT_LABELS: - uifont = kCTFontLabelFontType; + uifont = kCTFontUIFontLabel; break; case wxOSX_SYSTEM_FONT_VIEWS: - uifont = kCTFontViewsFontType; + uifont = kCTFontUIFontViews; break; case wxOSX_SYSTEM_FONT_FIXED: uifont = kCTFontUIFontUserFixedPitch;