X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/288059b2b9d1d4b562e1a0d06f7026936793bc79..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/gtk/settings.cpp?ds=sidebyside

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 227599ef0b..510f5a4be1 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -8,10 +8,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "settings.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/settings.h"
 #include "wx/debug.h"
 #include "wx/module.h"
@@ -328,8 +331,23 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
             if (!g_systemFont)
             {
 #ifdef __WXGTK20__
-                const gchar *font_name = _gtk_rc_context_get_default_font_name (gtk_settings_get_default ());
-                g_systemFont = new wxFont( wxString::FromAscii( font_name ) );
+                GtkWidget *widget = gtk_button_new();
+                GtkStyle *def = gtk_rc_get_style( widget );
+                if ( !def || !def->font_desc )
+                    def = gtk_widget_get_default_style();  
+                if ( def && def->font_desc )
+                {  
+                    wxNativeFontInfo info;  
+                    info.description = def->font_desc;  
+                    g_systemFont = new wxFont(info);  
+                }  
+                else  
+                {  
+                    const gchar *font_name =
+                        _gtk_rc_context_get_default_font_name(gtk_settings_get_default());
+                    g_systemFont = new wxFont(wxString::FromAscii(font_name));
+                }  
+                gtk_widget_destroy( widget );
 #else
                 g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
 #endif