X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db434467a143a2c847c4bcfe987f0202c2d02bf2..2a31049201e9c1ff9f515eb9d144ae392f4b4e5a:/src/gtk1/settings.cpp

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 2fde66188c..ca5965f55d 100644
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -128,23 +128,29 @@ wxColour wxSystemSettings::GetSystemColour( int index )
         {
             if (!g_systemHighlightColour)
             {
-/*
-                g_systemHighlightColour = 
-	                new wxColour( 0      >> SHIFT,
-	                              0      >> SHIFT,
-			                      0x9c40 >> SHIFT );
-*/              
                 GtkWidget *widget = gtk_button_new();
                 GtkStyle *def = gtk_rc_get_style( widget );
-                int red = def->bg[GTK_STATE_SELECTED].red;
-                int green = def->bg[GTK_STATE_SELECTED].green;
-                int blue = def->bg[GTK_STATE_SELECTED].blue;
+                if (!def)
+                    def = gtk_widget_get_default_style();
+                if (def)
+                {
+                    int red = def->bg[GTK_STATE_SELECTED].red;
+                    int green = def->bg[GTK_STATE_SELECTED].green;
+                    int blue = def->bg[GTK_STATE_SELECTED].blue;
+                    g_systemHighlightColour = 
+	                    new wxColour( red    >> SHIFT,
+	                                  green  >> SHIFT,
+			                          blue   >> SHIFT );
+                }
+                else
+                {
+                    g_systemHighlightColour = 
+	                    new wxColour( 0      >> SHIFT,
+	                                  0      >> SHIFT,
+			                          0x9c40 >> SHIFT );
+                }
                 gtk_widget_destroy( widget );
 
-                g_systemHighlightColour = 
-	                new wxColour( red    >> SHIFT,
-	                              green  >> SHIFT,
-			                      blue   >> SHIFT );
             }
             return *g_systemHighlightColour;
         }
@@ -186,7 +192,7 @@ wxFont wxSystemSettings::GetSystemFont( int index )
         case wxSYS_DEFAULT_GUI_FONT:
         {
             if (!g_systemFont)
-                g_systemFont = new wxFont( 16, wxSWISS, wxNORMAL, wxNORMAL );
+                g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
             return *g_systemFont;
         }
     }