X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7370dac93e93ef816468a0d48a2029680d2ecb5..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/gtk/settings.cpp

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 11273fff9f..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"
@@ -330,9 +333,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;