rtti api mods added

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

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 736ed76abaf84cdf45b1439c44ec94f4734aa42e..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,18 +333,20 @@ 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)
-                    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 );
-                }
+                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 );
                 gtk_widget_destroy( widget );
 #else
                 g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );