diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2002-01-10 23:10:34 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2002-01-10 23:10:34 +0000 |
| commit | e5bba6a165a3e92506de2c1fd7afe2cb9f9c84d9 (patch) | |
| tree | d9f1d537d8b0912fdd78b02d77c2489895b7172b /gtk/gtkwidget.c | |
| parent | 868603bc15afcd2f90c56054ce9975e0fdee0ea6 (diff) | |
| download | gtk+-e5bba6a165a3e92506de2c1fd7afe2cb9f9c84d9.tar.gz | |
Rename to reset_rc_styles_recurse(). (#68084)
* gtk/gtkwidget.c (gtk_widget_set_style_recurse): Rename to
reset_rc_styles_recurse(). (#68084)
* gtk/tmpl/gtkaccellabel.sgml: Remove duplicate docs.
* gdk-pixbuf/Makefile.am (content_files): Add
gdk-pixbuf-from-drawables.sgml. (#68232)
* gtk/tmpl/gtkwidget.sgml: Improve docs for GTK_NO_REPARENT
and GTK_APP_PAINTABLE. (#68060)
Diffstat (limited to 'gtk/gtkwidget.c')
| -rw-r--r-- | gtk/gtkwidget.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index ee520ba814..39f9e060c4 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -204,8 +204,6 @@ static void gtk_widget_reset_rc_style (GtkWidget static void gtk_widget_set_style_internal (GtkWidget *widget, GtkStyle *style, gboolean initial_emission); -static void gtk_widget_set_style_recurse (GtkWidget *widget, - gpointer client_data); static gint gtk_widget_event_internal (GtkWidget *widget, GdkEvent *event); static gboolean gtk_widget_real_mnemonic_activate (GtkWidget *widget, @@ -3736,7 +3734,7 @@ gtk_widget_set_parent (GtkWidget *widget, gtk_widget_propagate_state (widget, &data); - gtk_widget_set_style_recurse (widget, NULL); + gtk_widget_reset_rc_styles (widget); gtk_signal_emit (GTK_OBJECT (widget), widget_signals[PARENT_SET], NULL); if (GTK_WIDGET_ANCHORED (widget->parent)) @@ -4183,19 +4181,6 @@ gtk_widget_set_style_internal (GtkWidget *widget, } static void -gtk_widget_set_style_recurse (GtkWidget *widget, - gpointer client_data) -{ - if (GTK_WIDGET_RC_STYLE (widget)) - gtk_widget_reset_rc_style (widget); - - if (GTK_IS_CONTAINER (widget)) - gtk_container_forall (GTK_CONTAINER (widget), - gtk_widget_set_style_recurse, - NULL); -} - -static void gtk_widget_propagate_hierarchy_changed_recurse (GtkWidget *widget, gpointer client_data) { @@ -4247,12 +4232,24 @@ _gtk_widget_propagate_hierarchy_changed (GtkWidget *widget, g_object_unref (previous_toplevel); } +static void +reset_rc_styles_recurse (GtkWidget *widget, gpointer data) +{ + if (GTK_WIDGET_RC_STYLE (widget)) + gtk_widget_reset_rc_style (widget); + + if (GTK_IS_CONTAINER (widget)) + gtk_container_forall (GTK_CONTAINER (widget), + reset_rc_styles_recurse, + NULL); +} + void gtk_widget_reset_rc_styles (GtkWidget *widget) { g_return_if_fail (GTK_IS_WIDGET (widget)); - gtk_widget_set_style_recurse (widget, NULL); + reset_rc_styles_recurse (widget, NULL); } /** |