compilation fixes for multilib/DLL build

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

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 9aed45b5a9785c40154876cfc4ff9826264f6e8b..fded8203fda805705f4134aa4a0c06156e4cdb1f 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -16,6 +16,7 @@
 #include "wx/debug.h"
 #include "wx/module.h"
 #include "wx/cmndata.h"
+#include "wx/fontutil.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkprivate.h>
@@ -326,8 +327,27 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
         {
             if (!g_systemFont)
             {
+#ifdef __WXGTK20__
+                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
             }
             return *g_systemFont;
         }