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

wxGTK now chooses better font when no matching

Browse Source 
font family is found (and doesn't crash then)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-01-23 10:14:38 +00:00
parent 89077ebcc8
commit b1c71cd056
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/font.cpp
View File

@@ -510,7 +510,11 @@ static char *font_defaults[] = {
"ScreenItalic", "i", "ScreenItalic", "i",
"ScreenSlant", "o", "ScreenSlant", "o",
/*
"ScreenDefaultBase", "misc-fixed", "ScreenDefaultBase", "misc-fixed",
*/
"ScreenDefaultBase", "*-times",
"ScreenRomanBase", "*-times", "ScreenRomanBase", "*-times",
"ScreenDecorativeBase", "*-helvetica", "ScreenDecorativeBase", "*-helvetica",
"ScreenModernBase", "*-courier", "ScreenModernBase", "*-courier",
@@ -628,7 +632,8 @@ static void SearchResource(const char *prefix, const char **names, int count, ch
if (internal) if (internal)
{ {
if (strcmp(internal,"-${ScreenDefaultBase}${ScreenStdSuffix}") == 0) if ((strcmp(internal,"-${ScreenDefaultBase}${ScreenStdSuffix}") == 0) &&
(strcmp(names[0], "Default") != 0))
{ {
/* we did not find any font name in the standard list. /* we did not find any font name in the standard list.
this can (hopefully does) mean that someone supplied this can (hopefully does) mean that someone supplied

7
src/gtk1/font.cpp
View File

@@ -510,7 +510,11 @@ static char *font_defaults[] = {
"ScreenItalic", "i", "ScreenItalic", "i",
"ScreenSlant", "o", "ScreenSlant", "o",
/*
"ScreenDefaultBase", "misc-fixed", "ScreenDefaultBase", "misc-fixed",
*/
"ScreenDefaultBase", "*-times",
"ScreenRomanBase", "*-times", "ScreenRomanBase", "*-times",
"ScreenDecorativeBase", "*-helvetica", "ScreenDecorativeBase", "*-helvetica",
"ScreenModernBase", "*-courier", "ScreenModernBase", "*-courier",
@@ -628,7 +632,8 @@ static void SearchResource(const char *prefix, const char **names, int count, ch
if (internal) if (internal)
{ {
if (strcmp(internal,"-${ScreenDefaultBase}${ScreenStdSuffix}") == 0) if ((strcmp(internal,"-${ScreenDefaultBase}${ScreenStdSuffix}") == 0) &&
(strcmp(names[0], "Default") != 0))
{ {
/* we did not find any font name in the standard list. /* we did not find any font name in the standard list.
this can (hopefully does) mean that someone supplied this can (hopefully does) mean that someone supplied