]> Pileus Git - ~andy/gtk/commitdiff
entry: Split out style-updating things into their own function
authorBenjamin Otte <otte@redhat.com>
Tue, 19 Apr 2011 17:53:10 +0000 (19:53 +0200)
committerBenjamin Otte <otte@redhat.com>
Tue, 19 Apr 2011 20:18:19 +0000 (22:18 +0200)
gtk/gtkentry.c

index 9b324359b6956f643413b62cef026b17019939a2..ce53b1b97eec96a3410b2d90e4796ed47151f3d2 100644 (file)
@@ -4524,26 +4524,32 @@ icon_margin_changed (GtkEntry *entry)
   priv->icon_margin = border.left;
 }
 
-static void 
-gtk_entry_style_updated (GtkWidget *widget)
+static void
+gtk_entry_update_cached_style_values (GtkEntry *entry)
 {
-  GtkEntry *entry = GTK_ENTRY (widget);
   GtkEntryPrivate *priv = entry->priv;
   gint focus_width;
   gboolean interior_focus;
 
-  GTK_WIDGET_CLASS (gtk_entry_parent_class)->style_updated (widget);
-
-  gtk_widget_style_get (widget,
+  gtk_widget_style_get (GTK_WIDGET (entry),
                        "focus-line-width", &focus_width,
                        "interior-focus", &interior_focus,
                        NULL);
-
   priv->focus_width = focus_width;
   priv->interior_focus = interior_focus;
 
   if (!priv->invisible_char_set)
     priv->invisible_char = find_invisible_char (GTK_WIDGET (entry));
+}
+
+static void 
+gtk_entry_style_updated (GtkWidget *widget)
+{
+  GtkEntry *entry = GTK_ENTRY (widget);
+
+  GTK_WIDGET_CLASS (gtk_entry_parent_class)->style_updated (widget);
+
+  gtk_entry_update_cached_style_values (entry);
 
   gtk_entry_recompute (entry);