Avoid infinite recursion between wxStockGDI and wxSystemSettions

There was a possible recursion from wxStockGDI::GetFont to wxSystemSettings::GetFont and back, resolve by using direct font creation, adding fixed system font.
audacity · Dec 2, 2020 · 07e7d83 · 07e7d83
1 parent 58ad95e
commit 07e7d83
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h
@@ -26,7 +26,8 @@ enum wxOSXSystemFont
     wxOSX_SYSTEM_FONT_MINI,
     wxOSX_SYSTEM_FONT_MINI_BOLD,
     wxOSX_SYSTEM_FONT_LABELS,
-    wxOSX_SYSTEM_FONT_VIEWS
+    wxOSX_SYSTEM_FONT_VIEWS,
+    wxOSX_SYSTEM_FONT_FIXED
 };
 
 

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
@@ -471,6 +471,8 @@ wxFont::wxFont(wxOSXSystemFont font)
         case wxOSX_SYSTEM_FONT_VIEWS:
             uifont = kCTFontViewsFontType;
             break;
+        case wxOSX_SYSTEM_FONT_FIXED:
+            uifont = kCTFontUIFontUserFixedPitch;
         default:
             break;
     }

diff --git a/src/osx/cocoa/settings.mm b/src/osx/cocoa/settings.mm
@@ -196,15 +196,15 @@ static int wxOSXGetUserDefault(NSString* key, int defaultValue)
         case wxSYS_DEVICE_DEFAULT_FONT :
         case wxSYS_DEFAULT_GUI_FONT :
             {
-                return *wxSMALL_FONT ;
+                return wxFont(wxOSX_SYSTEM_FONT_SMALL) ;
             } ;
             break ;
         case wxSYS_OEM_FIXED_FONT :
         case wxSYS_ANSI_FIXED_FONT :
         case wxSYS_SYSTEM_FIXED_FONT :
         default :
             {
-                return *wxNORMAL_FONT ;
+                return wxFont(wxOSX_SYSTEM_FONT_FIXED) ;
             } ;
             break ;