summaryrefslogtreecommitdiff
path: root/gtk/gtkcontainer.c
diff options
context:
space:
mode:
Diffstat (limited to 'gtk/gtkcontainer.c')
-rw-r--r--gtk/gtkcontainer.c62
1 files changed, 21 insertions, 41 deletions
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 3fcc221f78..55907f0da4 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1941,34 +1941,6 @@ gtk_container_queue_resize_handler (GtkContainer *container)
}
}
-static void
-_gtk_container_queue_resize_internal (GtkContainer *container,
- gboolean invalidate_only)
-{
- GtkWidget *widget;
-
- g_return_if_fail (GTK_IS_CONTAINER (container));
-
- widget = GTK_WIDGET (container);
-
- do
- {
- _gtk_widget_set_alloc_needed (widget, TRUE);
- _gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget));
-
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
- if (GTK_IS_RESIZE_CONTAINER (widget))
- break;
- G_GNUC_END_IGNORE_DEPRECATIONS;
-
- widget = gtk_widget_get_parent (widget);
- }
- while (widget);
-
- if (widget && !invalidate_only)
- gtk_container_queue_resize_handler (GTK_CONTAINER (widget));
-}
-
void
_gtk_container_queue_restyle (GtkContainer *container)
{
@@ -1999,20 +1971,28 @@ _gtk_container_queue_restyle (GtkContainer *container)
void
_gtk_container_queue_resize (GtkContainer *container)
{
- _gtk_container_queue_resize_internal (container, FALSE);
-}
+ GtkWidget *widget;
-/**
- * _gtk_container_resize_invalidate:
- * @container: a #GtkContainer
- *
- * Invalidates cached sizes like _gtk_container_queue_resize() but doesn't
- * actually queue the resize container for resize.
- */
-void
-_gtk_container_resize_invalidate (GtkContainer *container)
-{
- _gtk_container_queue_resize_internal (container, TRUE);
+ g_return_if_fail (GTK_IS_CONTAINER (container));
+
+ widget = GTK_WIDGET (container);
+
+ do
+ {
+ _gtk_widget_set_alloc_needed (widget, TRUE);
+ _gtk_size_request_cache_clear (_gtk_widget_peek_request_cache (widget));
+
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+ if (GTK_IS_RESIZE_CONTAINER (widget))
+ break;
+ G_GNUC_END_IGNORE_DEPRECATIONS;
+
+ widget = gtk_widget_get_parent (widget);
+ }
+ while (widget);
+
+ if (widget)
+ gtk_container_queue_resize_handler (GTK_CONTAINER (widget));
}
void