Don't use GTK_WIDGET_*SET_FLAGS (wid, GTK_RC_STYLE)

https://bugzilla.gnome.org/show_bug.cgi?id=69872
This commit is contained in:
Javier Jardón 2010-03-06 13:01:58 +01:00
parent 24491f8224
commit a7efb2eaa0

View File

@ -6452,7 +6452,7 @@ gtk_widget_set_style (GtkWidget *widget,
initial_emission = !gtk_widget_has_rc_style (widget) && !GTK_WIDGET_USER_STYLE (widget); initial_emission = !gtk_widget_has_rc_style (widget) && !GTK_WIDGET_USER_STYLE (widget);
GTK_WIDGET_UNSET_FLAGS (widget, GTK_RC_STYLE); GTK_OBJECT_FLAGS (widget) &= ~(GTK_RC_STYLE);
GTK_PRIVATE_SET_FLAG (widget, GTK_USER_STYLE); GTK_PRIVATE_SET_FLAG (widget, GTK_USER_STYLE);
gtk_widget_set_style_internal (widget, style, initial_emission); gtk_widget_set_style_internal (widget, style, initial_emission);
@ -6495,7 +6495,7 @@ gtk_widget_reset_rc_style (GtkWidget *widget)
initial_emission = !gtk_widget_has_rc_style (widget) && !GTK_WIDGET_USER_STYLE (widget); initial_emission = !gtk_widget_has_rc_style (widget) && !GTK_WIDGET_USER_STYLE (widget);
GTK_PRIVATE_UNSET_FLAG (widget, GTK_USER_STYLE); GTK_PRIVATE_UNSET_FLAG (widget, GTK_USER_STYLE);
GTK_WIDGET_SET_FLAGS (widget, GTK_RC_STYLE); GTK_OBJECT_FLAGS (widget) |= GTK_RC_STYLE;
if (gtk_widget_has_screen (widget)) if (gtk_widget_has_screen (widget))
new_style = gtk_rc_get_style (widget); new_style = gtk_rc_get_style (widget);