summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>1999-09-26 23:46:57 +0000
committerOwen Taylor <otaylor@src.gnome.org>1999-09-26 23:46:57 +0000
commit6b5d56e39ccc13e3f90da286687ad946c9926fb4 (patch)
treeae7711f095da720586ca7c052cae970537182abe
parent7a4bc2038fc1b5a94ff89475ea01add4483071a6 (diff)
downloadgdk-pixbuf-6b5d56e39ccc13e3f90da286687ad946c9926fb4.tar.gz
We may be queueing a resize on a toplevel container between the time we
Sun Sep 26 19:44:34 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtkcontainer.c (gtk_container_queue_resize): We may be queueing a resize on a toplevel container between the time we show it and when we map it. So, we need to test GTK_WIDGET_VISIBLE() for toplevels, and only use GTK_WIDGET_DRAWABLE() for child windows.
-rw-r--r--ChangeLog8
-rw-r--r--ChangeLog.pre-2-08
-rw-r--r--ChangeLog.pre-2-108
-rw-r--r--ChangeLog.pre-2-28
-rw-r--r--ChangeLog.pre-2-48
-rw-r--r--ChangeLog.pre-2-68
-rw-r--r--ChangeLog.pre-2-88
-rw-r--r--gtk/gtkcontainer.c3
8 files changed, 58 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 08e3a0688..562e3b498 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Sep 26 19:44:34 1999 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkcontainer.c (gtk_container_queue_resize): We may
+ be queueing a resize on a toplevel container between
+ the time we show it and when we map it. So, we need
+ to test GTK_WIDGET_VISIBLE() for toplevels, and only
+ use GTK_WIDGET_DRAWABLE() for child windows.
+
Thu Sep 23 20:11:38 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.2.5
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 08e3a0688..562e3b498 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Sun Sep 26 19:44:34 1999 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkcontainer.c (gtk_container_queue_resize): We may
+ be queueing a resize on a toplevel container between
+ the time we show it and when we map it. So, we need
+ to test GTK_WIDGET_VISIBLE() for toplevels, and only
+ use GTK_WIDGET_DRAWABLE() for child windows.
+
Thu Sep 23 20:11:38 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.2.5
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 08e3a0688..562e3b498 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Sun Sep 26 19:44:34 1999 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkcontainer.c (gtk_container_queue_resize): We may
+ be queueing a resize on a toplevel container between
+ the time we show it and when we map it. So, we need
+ to test GTK_WIDGET_VISIBLE() for toplevels, and only
+ use GTK_WIDGET_DRAWABLE() for child windows.
+
Thu Sep 23 20:11:38 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.2.5
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 08e3a0688..562e3b498 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Sun Sep 26 19:44:34 1999 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkcontainer.c (gtk_container_queue_resize): We may
+ be queueing a resize on a toplevel container between
+ the time we show it and when we map it. So, we need
+ to test GTK_WIDGET_VISIBLE() for toplevels, and only
+ use GTK_WIDGET_DRAWABLE() for child windows.
+
Thu Sep 23 20:11:38 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.2.5
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 08e3a0688..562e3b498 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Sun Sep 26 19:44:34 1999 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkcontainer.c (gtk_container_queue_resize): We may
+ be queueing a resize on a toplevel container between
+ the time we show it and when we map it. So, we need
+ to test GTK_WIDGET_VISIBLE() for toplevels, and only
+ use GTK_WIDGET_DRAWABLE() for child windows.
+
Thu Sep 23 20:11:38 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.2.5
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 08e3a0688..562e3b498 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Sun Sep 26 19:44:34 1999 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkcontainer.c (gtk_container_queue_resize): We may
+ be queueing a resize on a toplevel container between
+ the time we show it and when we map it. So, we need
+ to test GTK_WIDGET_VISIBLE() for toplevels, and only
+ use GTK_WIDGET_DRAWABLE() for child windows.
+
Thu Sep 23 20:11:38 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.2.5
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 08e3a0688..562e3b498 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Sun Sep 26 19:44:34 1999 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkcontainer.c (gtk_container_queue_resize): We may
+ be queueing a resize on a toplevel container between
+ the time we show it and when we map it. So, we need
+ to test GTK_WIDGET_VISIBLE() for toplevels, and only
+ use GTK_WIDGET_DRAWABLE() for child windows.
+
Thu Sep 23 20:11:38 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.2.5
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 0869de479..2e9367bb5 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -875,7 +875,8 @@ gtk_container_queue_resize (GtkContainer *container)
if (resize_container)
{
- if (GTK_WIDGET_DRAWABLE (resize_container))
+ if (GTK_WIDGET_VISIBLE (resize_container) &&
+ (GTK_WIDGET_TOPLEVEL (resize_container) || GTK_WIDGET_DRAWABLE (resize_container)))
{
switch (resize_container->resize_mode)
{