rtti api mods added

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

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 11273fff9fb1e45277ff8b16d13442732772a2cd..510f5a4be10dade2a228060af2f573fd0e0869d5 100644 (file)
--- 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
 
 #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"
 #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 );
 #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();  
                     def = gtk_widget_get_default_style();  

-                if (def)  
+                if ( def && def->font_desc )

                 {  
                     wxNativeFontInfo info;  
                     info.description = def->font_desc;  
                 {  
                     wxNativeFontInfo info;  
                     info.description = def->font_desc;