From bc879373a250a3aa41d64c3b66a33bf8e3d43d10 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Wed, 2 Jan 2002 22:08:49 +0000 Subject: [PATCH] don't ignore realized but visible && !mapped resize containers (which is Wed Jan 2 23:09:06 2002 Tim Janik * gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore realized but visible && !mapped resize containers (which is possible with unset CHILD_VISIBLE now). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkcontainer.c | 4 ++-- 8 files changed, 44 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd45653a47..06afd90dc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jan 2 23:09:06 2002 Tim Janik + + * gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore + realized but visible && !mapped resize containers (which is + possible with unset CHILD_VISIBLE now). + 2002-01-02 jacob berkman * gtk/Makefile.am (LDFLAGS): automake still doesn't support diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fd45653a47..06afd90dc9 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Wed Jan 2 23:09:06 2002 Tim Janik + + * gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore + realized but visible && !mapped resize containers (which is + possible with unset CHILD_VISIBLE now). + 2002-01-02 jacob berkman * gtk/Makefile.am (LDFLAGS): automake still doesn't support diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fd45653a47..06afd90dc9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Jan 2 23:09:06 2002 Tim Janik + + * gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore + realized but visible && !mapped resize containers (which is + possible with unset CHILD_VISIBLE now). + 2002-01-02 jacob berkman * gtk/Makefile.am (LDFLAGS): automake still doesn't support diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fd45653a47..06afd90dc9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Jan 2 23:09:06 2002 Tim Janik + + * gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore + realized but visible && !mapped resize containers (which is + possible with unset CHILD_VISIBLE now). + 2002-01-02 jacob berkman * gtk/Makefile.am (LDFLAGS): automake still doesn't support diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fd45653a47..06afd90dc9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Jan 2 23:09:06 2002 Tim Janik + + * gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore + realized but visible && !mapped resize containers (which is + possible with unset CHILD_VISIBLE now). + 2002-01-02 jacob berkman * gtk/Makefile.am (LDFLAGS): automake still doesn't support diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fd45653a47..06afd90dc9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Jan 2 23:09:06 2002 Tim Janik + + * gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore + realized but visible && !mapped resize containers (which is + possible with unset CHILD_VISIBLE now). + 2002-01-02 jacob berkman * gtk/Makefile.am (LDFLAGS): automake still doesn't support diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fd45653a47..06afd90dc9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Jan 2 23:09:06 2002 Tim Janik + + * gtk/gtkcontainer.c (_gtk_container_queue_resize): don't ignore + realized but visible && !mapped resize containers (which is + possible with unset CHILD_VISIBLE now). + 2002-01-02 jacob berkman * gtk/Makefile.am (LDFLAGS): automake still doesn't support diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 84a814e08c..79cdd4de2e 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -1056,7 +1056,7 @@ _gtk_container_queue_resize (GtkContainer *container) } if (GTK_WIDGET_VISIBLE (resize_container) && - (GTK_WIDGET_TOPLEVEL (resize_container) || GTK_WIDGET_DRAWABLE (resize_container))) + (GTK_WIDGET_TOPLEVEL (resize_container) || GTK_WIDGET_REALIZED (resize_container))) { switch (resize_container->resize_mode) { @@ -1077,7 +1077,7 @@ _gtk_container_queue_resize (GtkContainer *container) break; case GTK_RESIZE_PARENT: - /* Ignore, should not be reached */ + g_assert_not_reached (); break; } }