[gtk+/native-layout] Don't use GTK_WIDGET_*SET_FLAGS (wid, GTK_RC_STYLE)
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/native-layout] Don't use GTK_WIDGET_*SET_FLAGS (wid, GTK_RC_STYLE)
- Date: Sun, 4 Apr 2010 02:37:26 +0000 (UTC)
commit 9f3d23a9001c7d19561b793e31e45104e15296e2
Author: Javier Jardón <jjardon gnome org>
Date: Sat Mar 6 13:01:58 2010 +0100
Don't use GTK_WIDGET_*SET_FLAGS (wid, GTK_RC_STYLE)
https://bugzilla.gnome.org/show_bug.cgi?id=69872
gtk/gtkwidget.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 70f7d83..a9541c6 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -6467,7 +6467,7 @@ gtk_widget_set_style (GtkWidget *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_widget_set_style_internal (widget, style, initial_emission);
@@ -6510,7 +6510,7 @@ gtk_widget_reset_rc_style (GtkWidget *widget)
initial_emission = !gtk_widget_has_rc_style (widget) && !GTK_WIDGET_USER_STYLE (widget);
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))
new_style = gtk_rc_get_style (widget);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]