diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-04-13 16:51:19 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-04-17 08:59:23 +0200 |
| commit | 17ccbe484313d9a81e750b80dd7ddc41964b8ee3 (patch) | |
| tree | 5f881fc96dc3cdc117bc53405e78356944081242 /gtk/gtkcontainer.c | |
| parent | 53e714199a87a3879b65da5849a1ca75bdeee788 (diff) | |
| download | gtk+-17ccbe484313d9a81e750b80dd7ddc41964b8ee3.tar.gz | |
container: needs_resize is a container flag, not a widget flag
The widget flag is alloc_needed, needs_resize is used for "is queued
into the container resize queue".
Diffstat (limited to 'gtk/gtkcontainer.c')
| -rw-r--r-- | gtk/gtkcontainer.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 962afdeb9d..ad763136b6 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -239,6 +239,7 @@ struct _GtkContainerPrivate guint has_focus_chain : 1; guint reallocate_redraws : 1; + guint resize_pending : 1; guint resize_mode : 2; guint request_mode : 2; }; @@ -1351,7 +1352,7 @@ gtk_container_destroy (GtkWidget *widget) GtkContainer *container = GTK_CONTAINER (widget); GtkContainerPrivate *priv = container->priv; - if (_gtk_widget_get_resize_pending (GTK_WIDGET (container))) + if (priv->resize_pending) _gtk_container_dequeue_resize_handler (container); if (priv->focus_child) @@ -1542,10 +1543,10 @@ void _gtk_container_dequeue_resize_handler (GtkContainer *container) { g_return_if_fail (GTK_IS_CONTAINER (container)); - g_return_if_fail (_gtk_widget_get_resize_pending (GTK_WIDGET (container))); + g_return_if_fail (container->priv->resize_pending); container_resize_queue = g_slist_remove (container_resize_queue, container); - _gtk_widget_set_resize_pending (GTK_WIDGET (container), FALSE); + container->priv->resize_pending = FALSE; } /** @@ -1650,15 +1651,15 @@ gtk_container_idle_sizer (gpointer data) while (container_resize_queue) { - GtkWidget *widget; + GtkContainer *container; slist = container_resize_queue; container_resize_queue = slist->next; - widget = slist->data; + container = slist->data; g_slist_free_1 (slist); - _gtk_widget_set_resize_pending (widget, FALSE); - gtk_container_check_resize (GTK_CONTAINER (widget)); + container->priv->resize_pending = FALSE; + gtk_container_check_resize (container); } gdk_window_process_all_updates (); @@ -1682,9 +1683,9 @@ _gtk_container_queue_resize_handler (GtkContainer *container) switch (container->priv->resize_mode) { case GTK_RESIZE_QUEUE: - if (!_gtk_widget_get_resize_pending (widget)) + if (!container->priv->resize_pending) { - _gtk_widget_set_resize_pending (widget, TRUE); + container->priv->resize_pending = TRUE; if (container_resize_queue == NULL) gdk_threads_add_idle_full (GTK_PRIORITY_RESIZE, gtk_container_idle_sizer, |