From 2269ff5679ddefebbaa7de97ef8dd13cf1ca0be3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 20 Jun 2003 20:20:16 +0000 Subject: [PATCH] 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 --- src/gtk/settings.cpp | 4 ++-- src/gtk1/settings.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index 11273fff9f..fded8203fd 100644 --- 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 11273fff9f..fded8203fd 100644 --- 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; -- 2.50.0