Fixed style glitches

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

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 5bcfff6c21d80f697ce7d32faa0ba4f0ccc50564..11273fff9fb1e45277ff8b16d13442732772a2cd 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/debug.h"
 #include "wx/module.h"
 #include "wx/cmndata.h"

+#include "wx/fontutil.h"

 
 #include <gdk/gdk.h>
 #include <gdk/gdkprivate.h>
 
 #include <gdk/gdk.h>
 #include <gdk/gdkprivate.h>


@@ -326,8 +327,27 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
         {
             if (!g_systemFont)
             {
         {
             if (!g_systemFont)
             {

+#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  
+                {  
+                    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 );
                 g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );

-
+#endif

             }
             return *g_systemFont;
         }
             }
             return *g_systemFont;
         }


@@ -349,7 +369,9 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index )
         // VZ: is there any way to get the cursor size with GDK?
         case wxSYS_CURSOR_X:   return 16;
         case wxSYS_CURSOR_Y:   return 16;
         // VZ: is there any way to get the cursor size with GDK?
         case wxSYS_CURSOR_X:   return 16;
         case wxSYS_CURSOR_Y:   return 16;

-
+        // MBN: ditto for icons
+        case wxSYS_ICON_X:     return 32;
+        case wxSYS_ICON_Y:     return 32;

         default:               
             wxFAIL_MSG( wxT("wxSystemSettings::GetMetric not fully implemented") );
             return 0;
         default:               
             wxFAIL_MSG( wxT("wxSystemSettings::GetMetric not fully implemented") );
             return 0;