X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f618020a15f1647a83aaeab1fe315f90497a9876..bf918b97ed1ee60dbf296fa36764e6ac3e514b94:/src/gtk1/settings.cpp diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp index 9aed45b5a9..736ed76aba 100644 --- a/src/gtk1/settings.cpp +++ b/src/gtk1/settings.cpp @@ -16,6 +16,7 @@ #include "wx/debug.h" #include "wx/module.h" #include "wx/cmndata.h" +#include "wx/fontutil.h" #include #include @@ -326,8 +327,25 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) { if (!g_systemFont) { +#ifdef __WXGTK20__ + GtkWidget *widget = gtk_button_new(); + GtkStyle *def = gtk_rc_get_style( widget ); + if (!def) + def = gtk_widget_get_default_style(); + if (def) + { + wxNativeFontInfo info; + info.description = def->font_desc; + g_systemFont = new wxFont(info); + } + else + { + g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); + } + gtk_widget_destroy( widget ); +#else g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); - +#endif } return *g_systemFont; }