Flag invisible widgets as TOPLEVEL.

Mon Dec 11 11:41:12 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkinvisible.c (gtk_invisible_init): Flag invisible
	widgets as TOPLEVEL.

	* gtk/gtkwidget.c (gtk_widget_queue_resize): Don't assume
	TOPLEVEL widgets are containers.

	* gtk/gtkinvisible.h: Remove useless include.

diff --git a/ChangeLog b/ChangeLog
index a85a36767082db942c90cd237150d212d0e26515..d951aa6465ca780dcf68a6ead98bfa9013942698 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Dec 11 11:41:12 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkinvisible.c (gtk_invisible_init): Flag invisible
+       widgets as TOPLEVEL.
+
+       * gtk/gtkwidget.c (gtk_widget_queue_resize): Don't assume
+       TOPLEVEL widgets are containers.
+
+       * gtk/gtkinvisible.h: Remove useless include.
+
 2000-12-11  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a85a36767082db942c90cd237150d212d0e26515..d951aa6465ca780dcf68a6ead98bfa9013942698 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+Mon Dec 11 11:41:12 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkinvisible.c (gtk_invisible_init): Flag invisible
+       widgets as TOPLEVEL.
+
+       * gtk/gtkwidget.c (gtk_widget_queue_resize): Don't assume
+       TOPLEVEL widgets are containers.
+
+       * gtk/gtkinvisible.h: Remove useless include.
+
 2000-12-11  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a85a36767082db942c90cd237150d212d0e26515..d951aa6465ca780dcf68a6ead98bfa9013942698 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Mon Dec 11 11:41:12 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkinvisible.c (gtk_invisible_init): Flag invisible
+       widgets as TOPLEVEL.
+
+       * gtk/gtkwidget.c (gtk_widget_queue_resize): Don't assume
+       TOPLEVEL widgets are containers.
+
+       * gtk/gtkinvisible.h: Remove useless include.
+
 2000-12-11  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a85a36767082db942c90cd237150d212d0e26515..d951aa6465ca780dcf68a6ead98bfa9013942698 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+Mon Dec 11 11:41:12 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkinvisible.c (gtk_invisible_init): Flag invisible
+       widgets as TOPLEVEL.
+
+       * gtk/gtkwidget.c (gtk_widget_queue_resize): Don't assume
+       TOPLEVEL widgets are containers.
+
+       * gtk/gtkinvisible.h: Remove useless include.
+
 2000-12-11  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a85a36767082db942c90cd237150d212d0e26515..d951aa6465ca780dcf68a6ead98bfa9013942698 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+Mon Dec 11 11:41:12 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkinvisible.c (gtk_invisible_init): Flag invisible
+       widgets as TOPLEVEL.
+
+       * gtk/gtkwidget.c (gtk_widget_queue_resize): Don't assume
+       TOPLEVEL widgets are containers.
+
+       * gtk/gtkinvisible.h: Remove useless include.
+
 2000-12-11  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a85a36767082db942c90cd237150d212d0e26515..d951aa6465ca780dcf68a6ead98bfa9013942698 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Mon Dec 11 11:41:12 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkinvisible.c (gtk_invisible_init): Flag invisible
+       widgets as TOPLEVEL.
+
+       * gtk/gtkwidget.c (gtk_widget_queue_resize): Don't assume
+       TOPLEVEL widgets are containers.
+
+       * gtk/gtkinvisible.h: Remove useless include.
+
 2000-12-11  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a85a36767082db942c90cd237150d212d0e26515..d951aa6465ca780dcf68a6ead98bfa9013942698 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Mon Dec 11 11:41:12 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkinvisible.c (gtk_invisible_init): Flag invisible
+       widgets as TOPLEVEL.
+
+       * gtk/gtkwidget.c (gtk_widget_queue_resize): Don't assume
+       TOPLEVEL widgets are containers.
+
+       * gtk/gtkinvisible.h: Remove useless include.
+
 2000-12-11  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): 

diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c
index e7d8cc4088b0a6b9e0ea6511e6500905c5c2b871..1350a43900d734e4582a14a581a8375a61b9d530 100644 (file)
--- a/gtk/gtkinvisible.c
+++ b/gtk/gtkinvisible.c
@@ -24,6 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <gdk/gdk.h>
 #include "gtksignal.h"
 #include "gtkinvisible.h"
 
@@ -80,6 +81,7 @@ static void
 gtk_invisible_init (GtkInvisible *invisible)
 {
   GTK_WIDGET_UNSET_FLAGS (invisible, GTK_NO_WINDOW);
+  GTK_WIDGET_SET_FLAGS (invisible, GTK_TOPLEVEL);
 
   gtk_widget_ref (GTK_WIDGET (invisible));
   gtk_object_sink (GTK_OBJECT (invisible));

diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h
index 7214ecf553b113d32a99018297b019a41e8d0459..4ab0335239f7a20c51c5cc8a42d87bdaac22fc87 100644 (file)
--- a/gtk/gtkinvisible.h
+++ b/gtk/gtkinvisible.h
@@ -27,10 +27,7 @@
 #ifndef __GTK_INVISIBLE_H__
 #define __GTK_INVISIBLE_H__
 
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-
+#include <gtk/gtkwidget.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 3f7b4c9de3245e97aa31fe995a776386dc13c56c..001b1c81929523d611b912c046770e125f2bcca4 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1984,7 +1984,7 @@ gtk_widget_queue_resize (GtkWidget *widget)
 
   if (widget->parent)
     gtk_container_queue_resize (GTK_CONTAINER (widget->parent));
-  else if (GTK_WIDGET_TOPLEVEL (widget))
+  else if (GTK_WIDGET_TOPLEVEL (widget) && GTK_IS_CONTAINER (widget))
     gtk_container_queue_resize (GTK_CONTAINER (widget));
 }