Fix a doc comment

[~andy/gtk] / gtk / gtkrc.c

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 89a6c45276a0f9590e1b0e740ba63ab43be42164..70540a3130216ec571d1da699a9f7acd15976dd9 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -659,11 +659,15 @@ gtk_rc_color_hash_changed (GtkSettings  *settings,
                           GParamSpec   *pspec,
                           GtkRcContext *context)
 {
-  if (context->color_hash)
-    g_hash_table_unref (context->color_hash);
-  
+  GHashTable *old_hash;
+
+  old_hash = context->color_hash;
+
   g_object_get (settings, "color-hash", &context->color_hash, NULL);
 
+  if (old_hash)
+    g_hash_table_unref (old_hash);
+
   gtk_rc_reparse_all_for_settings (settings, TRUE);
 }
 
@@ -837,6 +841,8 @@ gtk_rc_parse_default_files (GtkRcContext *context)
 {
   gint i;
 
+  gtk_rc_add_initial_default_files ();
+
   for (i = 0; gtk_rc_default_files[i] != NULL; i++)
     gtk_rc_context_parse_file (context, gtk_rc_default_files[i], GTK_PATH_PRIO_RC, FALSE);
 }
@@ -865,6 +871,11 @@ _gtk_rc_init (void)
                       "  bg[NORMAL]   = \"#c4c2bd\"\n"
                       "}\n"
                       "\n"
+                      "style \"gtk-default-entry-style\" {\n"
+                      "  bg[SELECTED] = \"#b7c3cd\"\n"
+                      "  fg[SELECTED] = \"#000000\"\n"
+                      "}\n"
+                      "\n"
                       "style \"gtk-default-menu-bar-item-style\" {\n"
                       "  GtkMenuItem::horizontal_padding = 5\n"
                       "}\n"
@@ -876,18 +887,13 @@ _gtk_rc_init (void)
                       "  text[PRELIGHT] = \"#ffffff\"\n"
                       "}\n"
                       "\n"
-                       /* Make transparent tray icons work */
-                      "style \"gtk-default-tray-icon-style\" {\n"
-                      "  bg_pixmap[NORMAL] = \"<parent>\"\n"
-                      "}\n"
-                      "\n"
                        /* Work around clipping of accelerator underlines */
                        "style \"gtk-default-label-style\" {\n"
                        "  GtkWidget::draw-border = {0,0,0,1}\n"
                        "}\n"
                        "\n"    
                       "class \"GtkProgressBar\" style : gtk \"gtk-default-progress-bar-style\"\n"
-                      "class \"GtkTrayIcon\" style : gtk \"gtk-default-tray-icon-style\"\n"
+                      "class \"GtkEntry\" style : gtk \"gtk-default-entry-style\"\n"
                       "widget \"gtk-tooltip*\" style : gtk \"gtk-default-tooltips-style\"\n"
                       "widget_class \"*<GtkMenuItem>*\" style : gtk \"gtk-default-menu-item-style\"\n"
                       "widget_class \"*<GtkMenuBar>*<GtkMenuItem>\" style : gtk \"gtk-default-menu-bar-item-style\"\n"
@@ -3146,8 +3152,10 @@ gtk_rc_parse_style (GtkRcContext *context,
           break;
         case GTK_RC_TOKEN_COLOR:
           if (our_hash == NULL)
-            gtk_rc_style_prepend_empty_color_hash (rc_style);
-          our_hash = rc_priv->color_hashes->data;
+            {
+              gtk_rc_style_prepend_empty_color_hash (rc_style);
+              our_hash = rc_priv->color_hashes->data;
+            }
           token = gtk_rc_parse_logical_color (scanner, rc_style, our_hash);
           break;
        case G_TOKEN_IDENTIFIER:
@@ -4859,7 +4867,7 @@ _gtk_rc_match_widget_class (GSList  *list,
   return match_widget_class_recursive (list, length, path, path_reversed);
 }
 
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
 
 /* DLL ABI stability backward compatibility versions */