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

fix one of reasons for crash if there is no font

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-06-20 20:20:16 +00:00
parent f9747bcfed
commit 522652591a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/settings.cpp
View File

@@ -330,9 +330,9 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
#ifdef __WXGTK20__ #ifdef __WXGTK20__
GtkWidget *widget = gtk_button_new(); GtkWidget *widget = gtk_button_new();
GtkStyle *def = gtk_rc_get_style( widget ); GtkStyle *def = gtk_rc_get_style( widget );
if (!def) if ( !def || !def->font_desc )
def = gtk_widget_get_default_style(); def = gtk_widget_get_default_style();
if (def) if ( def && def->font_desc )
{ {
wxNativeFontInfo info; wxNativeFontInfo info;
info.description = def->font_desc; info.description = def->font_desc;

4
src/gtk1/settings.cpp
View File

@@ -330,9 +330,9 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
#ifdef __WXGTK20__ #ifdef __WXGTK20__
GtkWidget *widget = gtk_button_new(); GtkWidget *widget = gtk_button_new();
GtkStyle *def = gtk_rc_get_style( widget ); GtkStyle *def = gtk_rc_get_style( widget );
if (!def) if ( !def || !def->font_desc )
def = gtk_widget_get_default_style(); def = gtk_widget_get_default_style();
if (def) if ( def && def->font_desc )
{ {
wxNativeFontInfo info; wxNativeFontInfo info;
info.description = def->font_desc; info.description = def->font_desc;