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

Avoid infinite recursion between wxStockGDI and wxSystemSettions

Browse Source 
There was a possible recursion from wxStockGDI::GetFont to
wxSystemSettings::GetFont and back, resolve by using direct font
creation, adding fixed system font.
This commit is contained in:
Stefan Csomor
2020-07-10 15:07:04 +02:00
committed by Vadim Zeitlin
parent 7be80a858d
commit 74bc9b5f71
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/osx/font.h
View File

@@ -26,7 +26,8 @@ enum wxOSXSystemFont
wxOSX_SYSTEM_FONT_MINI, wxOSX_SYSTEM_FONT_MINI,
wxOSX_SYSTEM_FONT_MINI_BOLD, wxOSX_SYSTEM_FONT_MINI_BOLD,
wxOSX_SYSTEM_FONT_LABELS, wxOSX_SYSTEM_FONT_LABELS,
wxOSX_SYSTEM_FONT_VIEWS wxOSX_SYSTEM_FONT_VIEWS,
wxOSX_SYSTEM_FONT_FIXED
}; };

2
src/osx/carbon/font.cpp
View File

@@ -473,6 +473,8 @@ wxFont::wxFont(wxOSXSystemFont font)
case wxOSX_SYSTEM_FONT_VIEWS: case wxOSX_SYSTEM_FONT_VIEWS:
uifont = kCTFontViewsFontType; uifont = kCTFontViewsFontType;
break; break;
case wxOSX_SYSTEM_FONT_FIXED:
uifont = kCTFontUIFontUserFixedPitch;
default: default:
break; break;
} }

4
src/osx/cocoa/settings.mm
View File

@@ -205,7 +205,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
case wxSYS_DEVICE_DEFAULT_FONT : case wxSYS_DEVICE_DEFAULT_FONT :
case wxSYS_DEFAULT_GUI_FONT : case wxSYS_DEFAULT_GUI_FONT :
{ {
return *wxSMALL_FONT ; return wxFont(wxOSX_SYSTEM_FONT_SMALL) ;
} ; } ;
break ; break ;
case wxSYS_OEM_FIXED_FONT : case wxSYS_OEM_FIXED_FONT :
@@ -213,7 +213,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
case wxSYS_SYSTEM_FIXED_FONT : case wxSYS_SYSTEM_FIXED_FONT :
default : default :
{ {
return *wxNORMAL_FONT ; return wxFont(wxOSX_SYSTEM_FONT_FIXED) ;
} ; } ;
break ; break ;