Applied patch [ 681893 ] Combobox in toolbar

[wxWidgets.git] / src / gtk1 / settings.cpp

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 736ed76abaf84cdf45b1439c44ec94f4734aa42e..227599ef0bdd3570ccf4dab34b367c6b9ad58247 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -328,21 +328,8 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
             if (!g_systemFont)
             {
 #ifdef __WXGTK20__
             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 );
+                const gchar *font_name = _gtk_rc_context_get_default_font_name (gtk_settings_get_default ());
+                g_systemFont = new wxFont( wxString::FromAscii( font_name ) );

 #else
                 g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
 #endif
 #else
                 g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
 #endif