fix one of reasons for crash if there is no font

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 11273fff9fb1e45277ff8b16d13442732772a2cd..fded8203fda805705f4134aa4a0c06156e4cdb1f 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -330,9 +330,9 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
 #ifdef __WXGTK20__
                 GtkWidget *widget = gtk_button_new();
                 GtkStyle *def = gtk_rc_get_style( widget );
-                if (!def)  
+                if ( !def || !def->font_desc )
                     def = gtk_widget_get_default_style();  
-                if (def)  
+                if ( def && def->font_desc )
                 {  
                     wxNativeFontInfo info;  
                     info.description = def->font_desc;  

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 11273fff9fb1e45277ff8b16d13442732772a2cd..fded8203fda805705f4134aa4a0c06156e4cdb1f 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -330,9 +330,9 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
 #ifdef __WXGTK20__
                 GtkWidget *widget = gtk_button_new();
                 GtkStyle *def = gtk_rc_get_style( widget );
-                if (!def)  
+                if ( !def || !def->font_desc )
                     def = gtk_widget_get_default_style();  
-                if (def)  
+                if ( def && def->font_desc )
                 {  
                     wxNativeFontInfo info;  
                     info.description = def->font_desc;