From: Robert Roebling <robert@roebling.de>
Date: Sat, 23 Jan 1999 10:14:38 +0000 (+0000)
Subject:   wxGTK now chooses better font when no matching
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b1c71cd05602c8b3c088770aca3336c3f45fcaca

  wxGTK now chooses better font when no matching
    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
---

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index a327b75fd0..14435124ee 100644
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -510,7 +510,11 @@ static char *font_defaults[] = {
     "ScreenItalic", "i",
     "ScreenSlant", "o",
 
+/*
     "ScreenDefaultBase", "misc-fixed",
+*/
+    "ScreenDefaultBase", "*-times",
+    
     "ScreenRomanBase", "*-times",
     "ScreenDecorativeBase", "*-helvetica",
     "ScreenModernBase", "*-courier",
@@ -628,7 +632,8 @@ static void SearchResource(const char *prefix, const char **names, int count, ch
     
     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.
 	       this can (hopefully does) mean that someone supplied
diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index a327b75fd0..14435124ee 100644
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -510,7 +510,11 @@ static char *font_defaults[] = {
     "ScreenItalic", "i",
     "ScreenSlant", "o",
 
+/*
     "ScreenDefaultBase", "misc-fixed",
+*/
+    "ScreenDefaultBase", "*-times",
+    
     "ScreenRomanBase", "*-times",
     "ScreenDecorativeBase", "*-helvetica",
     "ScreenModernBase", "*-courier",
@@ -628,7 +632,8 @@ static void SearchResource(const char *prefix, const char **names, int count, ch
     
     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.
 	       this can (hopefully does) mean that someone supplied