From: Robert Roebling <robert@roebling.de>
Date: Tue, 16 Mar 2004 21:30:06 +0000 (+0000)
Subject:   This should fix a link error in GTK 2.3.X and
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/119cd341931c5f1266af4de39048eb46900fd3c0

  This should fix a link error in GTK 2.3.X and
   it is the right thing to do anyway.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index e2be4cd58c..d838381c99 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -313,9 +313,17 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
                 }  
                 else  
                 {  
-                    const gchar *font_name =
-                        _gtk_rc_context_get_default_font_name(gtk_settings_get_default());
-                    gs_objects.m_fontSystem = wxFont(wxString::FromAscii(font_name));
+                    GtkSettings *settings = gtk_settings_get_default();
+                    gchar *font_name = NULL;
+                    g_object_get ( settings,
+                                   "gtk-font-name", 
+                                   &font_name,
+                                   NULL);
+                    if (!font_name)
+                        gs_objects.m_fontSystem = wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
+                    else
+                        gs_objects.m_fontSystem = wxFont(wxString::FromAscii(font_name));
+                    g_free (font_name);
                 }  
                 gtk_widget_destroy( widget );
 #else
diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index e2be4cd58c..d838381c99 100644
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -313,9 +313,17 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
                 }  
                 else  
                 {  
-                    const gchar *font_name =
-                        _gtk_rc_context_get_default_font_name(gtk_settings_get_default());
-                    gs_objects.m_fontSystem = wxFont(wxString::FromAscii(font_name));
+                    GtkSettings *settings = gtk_settings_get_default();
+                    gchar *font_name = NULL;
+                    g_object_get ( settings,
+                                   "gtk-font-name", 
+                                   &font_name,
+                                   NULL);
+                    if (!font_name)
+                        gs_objects.m_fontSystem = wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
+                    else
+                        gs_objects.m_fontSystem = wxFont(wxString::FromAscii(font_name));
+                    g_free (font_name);
                 }  
                 gtk_widget_destroy( widget );
 #else