summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2010-03-02 18:24:21 +0100
committerJavier Jardón <jjardon@gnome.org>2010-03-02 18:24:21 +0100
commit491ed58420883ad68ff72691541d578422985d7d (patch)
tree9a630a1f0e21b155ec0fc8bbbfefdaf57bb8973f
parentf8fb228752a2873d5395fe71981c8dc57ca2a301 (diff)
downloadgtk+-491ed58420883ad68ff72691541d578422985d7d.tar.gz
Don't use GTK_WIDGET_*SET_FLAGS (wid, GTK_NO_SHOW_ALL)
-rw-r--r--gtk/gtkwidget.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index baa9359ccd..a928f7ea0a 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3325,7 +3325,7 @@ gtk_widget_show_all (GtkWidget *widget)
g_return_if_fail (GTK_IS_WIDGET (widget));
- if ((GTK_WIDGET_FLAGS (widget) & GTK_NO_SHOW_ALL) != 0)
+ if (gtk_widget_get_no_show_all (widget))
return;
class = GTK_WIDGET_GET_CLASS (widget);
@@ -3347,7 +3347,7 @@ gtk_widget_hide_all (GtkWidget *widget)
g_return_if_fail (GTK_IS_WIDGET (widget));
- if ((GTK_WIDGET_FLAGS (widget) & GTK_NO_SHOW_ALL) != 0)
+ if (gtk_widget_get_no_show_all (widget))
return;
class = GTK_WIDGET_GET_CLASS (widget);
@@ -10845,7 +10845,7 @@ gtk_widget_get_no_show_all (GtkWidget *widget)
{
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
- return (GTK_WIDGET_FLAGS (widget) & GTK_NO_SHOW_ALL) != 0;
+ return (GTK_OBJECT_FLAGS (widget) & GTK_NO_SHOW_ALL) != 0;
}
/**
@@ -10870,13 +10870,13 @@ gtk_widget_set_no_show_all (GtkWidget *widget,
no_show_all = (no_show_all != FALSE);
- if (no_show_all == ((GTK_WIDGET_FLAGS (widget) & GTK_NO_SHOW_ALL) != 0))
+ if (no_show_all == gtk_widget_get_no_show_all (widget))
return;
if (no_show_all)
- GTK_WIDGET_SET_FLAGS (widget, GTK_NO_SHOW_ALL);
+ GTK_OBJECT_FLAGS (widget) |= GTK_NO_SHOW_ALL;
else
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_NO_SHOW_ALL);
+ GTK_OBJECT_FLAGS (widget) &= ~(GTK_NO_SHOW_ALL);
g_object_notify (G_OBJECT (widget), "no-show-all");
}