callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

widget: Merge function into only caller

Browse Source
This commit is contained in:
Benjamin Otte 2012-03-20 14:38:44 +01:00
parent 257d961a01
commit 48a8ca8bbe
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkwidget.c
View File

@ -7982,18 +7982,6 @@ gtk_widget_is_sensitive (GtkWidget *widget)
return !(widget->priv->state_flags & GTK_STATE_FLAG_INSENSITIVE); return !(widget->priv->state_flags & GTK_STATE_FLAG_INSENSITIVE);
} }
static void
_gtk_widget_update_path (GtkWidget *widget)
{
if (widget->priv->path)
{
gtk_widget_path_free (widget->priv->path);
widget->priv->path = NULL;
}
gtk_widget_get_path (widget);
}
/** /**
* gtk_widget_set_parent: * gtk_widget_set_parent:
* @widget: a #GtkWidget * @widget: a #GtkWidget
@ -8522,7 +8510,13 @@ _gtk_widget_propagate_screen_changed (GtkWidget *widget,
static void static void
reset_style_recurse (GtkWidget *widget, gpointer data) reset_style_recurse (GtkWidget *widget, gpointer data)
{ {
_gtk_widget_update_path (widget); if (widget->priv->path)
{
gtk_widget_path_free (widget->priv->path);
widget->priv->path = NULL;
}
gtk_widget_get_path (widget);
if (GTK_IS_CONTAINER (widget)) if (GTK_IS_CONTAINER (widget))
gtk_container_forall (GTK_CONTAINER (widget), gtk_container_forall (GTK_CONTAINER (widget),