From fc86f630a6ef708fab60d5f61c538eef13580bb4 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Mon, 2 Feb 1998 21:41:24 +0000 Subject: [PATCH] dunno, what cvs wants right now. i just told me these changes are already commited... ;( -timj --- gtk/gtkcontainer.c | 2 +- gtk/gtkmain.c | 4 ++-- gtk/gtkprivate.h | 4 ++-- gtk/gtkwidget.c | 28 ++++++++++++++-------------- gtk/gtkwindow.c | 8 ++++---- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 6dbb089e61..a63bd764b5 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -224,7 +224,7 @@ gtk_container_destroy (GtkObject *object) GtkWidget *child; child = (GtkWidget*) node->data; - GTK_PRIVATE_UNSET_FLAGS (child, GTK_RESIZE_NEEDED); + GTK_PRIVATE_UNSET_FLAG (child, GTK_RESIZE_NEEDED); } g_slist_free (GTK_CONTAINER (object)->resize_widgets); GTK_CONTAINER (object)->resize_widgets = NULL; diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index a879c64ae9..d932cb6c38 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -440,14 +440,14 @@ gtk_main_iteration_do (gboolean blocking) { gtk_widget_event (grab_widget, event); if (event_widget == grab_widget) - GTK_PRIVATE_SET_FLAGS (event_widget, GTK_LEAVE_PENDING); + GTK_PRIVATE_SET_FLAG (event_widget, GTK_LEAVE_PENDING); } break; case GDK_LEAVE_NOTIFY: if (event_widget && GTK_WIDGET_LEAVE_PENDING (event_widget)) { - GTK_PRIVATE_UNSET_FLAGS (event_widget, GTK_LEAVE_PENDING); + GTK_PRIVATE_UNSET_FLAG (event_widget, GTK_LEAVE_PENDING); gtk_widget_event (event_widget, event); } else if (grab_widget && GTK_WIDGET_IS_SENSITIVE (grab_widget)) diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h index 32014f1a98..ec4bd4d0c0 100644 --- a/gtk/gtkprivate.h +++ b/gtk/gtkprivate.h @@ -57,8 +57,8 @@ enum * we use a preprocessor string concatenation here for a clear * flags/private_flags distinction at the cost of single flag operations. */ -#define GTK_PRIVATE_SET_FLAGS(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) |= (PRIVATE_ ## flag)); }G_STMT_END -#define GTK_PRIVATE_UNSET_FLAGS(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) &= ~(PRIVATE_ ## flag)); }G_STMT_END +#define GTK_PRIVATE_SET_FLAG(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) |= (PRIVATE_ ## flag)); }G_STMT_END +#define GTK_PRIVATE_UNSET_FLAG(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) &= ~(PRIVATE_ ## flag)); }G_STMT_END diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index df2724af04..b174a1a761 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -1218,7 +1218,7 @@ gtk_widget_hide_all (GtkWidget *widget) if (toplevel != widget) GTK_CONTAINER (toplevel)->resize_widgets = g_slist_remove (GTK_CONTAINER (toplevel)->resize_widgets, widget); - GTK_PRIVATE_UNSET_FLAGS (widget, GTK_RESIZE_NEEDED); + GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_NEEDED); } widget_class = GTK_WIDGET_CLASS(GTK_OBJECT(widget)->klass); @@ -1386,7 +1386,7 @@ gtk_widget_queue_draw (GtkWidget *widget) parent = parent->parent; } - GTK_PRIVATE_SET_FLAGS (widget, GTK_REDRAW_PENDING); + GTK_PRIVATE_SET_FLAG (widget, GTK_REDRAW_PENDING); if (gtk_widget_redraw_queue == NULL) gtk_idle_add ((GtkFunction) gtk_widget_idle_draw, NULL); @@ -1432,7 +1432,7 @@ gtk_widget_queue_resize (GtkWidget *widget) { if (!GTK_CONTAINER_RESIZE_PENDING (toplevel)) { - GTK_PRIVATE_SET_FLAGS (toplevel, GTK_RESIZE_PENDING); + GTK_PRIVATE_SET_FLAG (toplevel, GTK_RESIZE_PENDING); if (gtk_widget_resize_queue == NULL) gtk_idle_add ((GtkFunction) gtk_widget_idle_sizer, NULL); gtk_widget_resize_queue = g_slist_prepend (gtk_widget_resize_queue, toplevel); @@ -1440,7 +1440,7 @@ gtk_widget_queue_resize (GtkWidget *widget) if (!GTK_WIDGET_RESIZE_NEEDED (widget)) { - GTK_PRIVATE_SET_FLAGS (widget, GTK_RESIZE_NEEDED); + GTK_PRIVATE_SET_FLAG (widget, GTK_RESIZE_NEEDED); GTK_CONTAINER (toplevel)->resize_widgets = g_slist_prepend (GTK_CONTAINER (toplevel)->resize_widgets, widget); } @@ -1871,7 +1871,7 @@ gtk_widget_reparent (GtkWidget *widget, { /* Set a flag so that gtk_widget_unparent doesn't unrealize widget */ - GTK_PRIVATE_SET_FLAGS (widget, GTK_IN_REPARENT); + GTK_PRIVATE_SET_FLAG (widget, GTK_IN_REPARENT); } gtk_widget_ref (widget); @@ -1908,7 +1908,7 @@ gtk_widget_reparent (GtkWidget *widget, else gdk_window_reparent (widget->window, gtk_widget_get_parent_window (widget), 0, 0); - GTK_PRIVATE_UNSET_FLAGS (widget, GTK_IN_REPARENT); + GTK_PRIVATE_UNSET_FLAG (widget, GTK_IN_REPARENT); } } } @@ -2327,7 +2327,7 @@ gtk_widget_set_style (GtkWidget *widget, { g_return_if_fail (widget != NULL); - GTK_PRIVATE_SET_FLAGS (widget, GTK_USER_STYLE); + GTK_PRIVATE_SET_FLAG (widget, GTK_USER_STYLE); gtk_widget_set_style_internal (widget, style); } @@ -3065,13 +3065,13 @@ gtk_widget_real_destroy (GtkObject *object) if (GTK_WIDGET_REDRAW_PENDING (widget)) { gtk_widget_redraw_queue = g_slist_remove (gtk_widget_redraw_queue, widget); - GTK_PRIVATE_UNSET_FLAGS (widget, GTK_REDRAW_PENDING); + GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_PENDING); } if (GTK_CONTAINER_RESIZE_PENDING (widget)) { gtk_widget_resize_queue = g_slist_remove (gtk_widget_resize_queue, widget); - GTK_PRIVATE_UNSET_FLAGS (widget, GTK_RESIZE_PENDING); + GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_PENDING); } if (GTK_WIDGET_RESIZE_NEEDED (widget)) @@ -3081,7 +3081,7 @@ gtk_widget_real_destroy (GtkObject *object) toplevel = gtk_widget_get_toplevel (widget); GTK_CONTAINER (toplevel)->resize_widgets = g_slist_remove (GTK_CONTAINER (toplevel)->resize_widgets, widget); - GTK_PRIVATE_UNSET_FLAGS (widget, GTK_RESIZE_NEEDED); + GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_NEEDED); } if (GTK_WIDGET_HAS_SHAPE_MASK (widget)) @@ -3361,7 +3361,7 @@ gtk_widget_real_queue_draw (GtkWidget *widget) g_return_val_if_fail (widget != NULL, FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); - GTK_PRIVATE_UNSET_FLAGS (widget, GTK_REDRAW_PENDING); + GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_PENDING); gtk_widget_draw (widget, NULL); return FALSE; @@ -3381,7 +3381,7 @@ gtk_widget_real_queue_resize (GtkWidget *widget) g_return_val_if_fail (widget != NULL, FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); - GTK_PRIVATE_UNSET_FLAGS (widget, GTK_RESIZE_PENDING); + GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_PENDING); gtk_container_need_resize (GTK_CONTAINER (widget)); return FALSE; @@ -3694,7 +3694,7 @@ gtk_widget_shape_combine_mask (GtkWidget *widget, if (!shape_mask) { - GTK_PRIVATE_UNSET_FLAGS (widget, GTK_HAS_SHAPE_MASK); + GTK_PRIVATE_UNSET_FLAG (widget, GTK_HAS_SHAPE_MASK); shape_info = gtk_object_get_data (GTK_OBJECT (widget), shape_info_key); gtk_object_remove_data (GTK_OBJECT (widget), shape_info_key); @@ -3708,7 +3708,7 @@ gtk_widget_shape_combine_mask (GtkWidget *widget, } else { - GTK_PRIVATE_SET_FLAGS (widget, GTK_HAS_SHAPE_MASK); + GTK_PRIVATE_SET_FLAG (widget, GTK_HAS_SHAPE_MASK); shape_info = gtk_object_get_data (GTK_OBJECT (widget), shape_info_key); if (!shape_info) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 96baefb556..f6874e853e 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -1085,7 +1085,7 @@ gtk_real_window_move_resize (GtkWindow *window, { child = (GtkWidget *)node->data; - GTK_PRIVATE_UNSET_FLAGS (child, GTK_RESIZE_NEEDED); + GTK_PRIVATE_UNSET_FLAG (child, GTK_RESIZE_NEEDED); widget = child->parent; while (widget && @@ -1094,7 +1094,7 @@ gtk_real_window_move_resize (GtkWindow *window, widget = widget->parent; if (widget) - GTK_PRIVATE_SET_FLAGS (widget, GTK_RESIZE_NEEDED); + GTK_PRIVATE_SET_FLAG (widget, GTK_RESIZE_NEEDED); } for (node = resize_widgets; node; node = node->next) @@ -1115,7 +1115,7 @@ gtk_real_window_move_resize (GtkWindow *window, { if (GTK_WIDGET_RESIZE_NEEDED (widget)) { - GTK_PRIVATE_UNSET_FLAGS (resize_container, GTK_RESIZE_NEEDED); + GTK_PRIVATE_UNSET_FLAG (resize_container, GTK_RESIZE_NEEDED); resize_container = widget; } widget = widget->parent; @@ -1135,7 +1135,7 @@ gtk_real_window_move_resize (GtkWindow *window, widget = tmp_list->data; tmp_list = tmp_list->next; - GTK_PRIVATE_UNSET_FLAGS (widget, GTK_RESIZE_NEEDED); + GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_NEEDED); gtk_widget_size_allocate (widget, &widget->allocation); gtk_widget_queue_draw (widget); }