From 5a188a9f13cd4fd4b4ae243796c92cb771313f64 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 11 Dec 2000 16:43:47 +0000 Subject: Flag invisible widgets as TOPLEVEL. Mon Dec 11 11:41:12 2000 Owen Taylor * 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. --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-0 | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-2 | 10 ++++++++++ ChangeLog.pre-2-4 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ gtk/gtkinvisible.c | 2 ++ gtk/gtkinvisible.h | 5 +---- gtk/gtkwidget.c | 2 +- 10 files changed, 74 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a85a367670..d951aa6465 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon Dec 11 11:41:12 2000 Owen Taylor + + * 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 * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index a85a367670..d951aa6465 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +Mon Dec 11 11:41:12 2000 Owen Taylor + + * 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 * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a85a367670..d951aa6465 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Mon Dec 11 11:41:12 2000 Owen Taylor + + * 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 * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a85a367670..d951aa6465 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Mon Dec 11 11:41:12 2000 Owen Taylor + + * 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 * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a85a367670..d951aa6465 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Mon Dec 11 11:41:12 2000 Owen Taylor + + * 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 * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a85a367670..d951aa6465 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Mon Dec 11 11:41:12 2000 Owen Taylor + + * 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 * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a85a367670..d951aa6465 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Mon Dec 11 11:41:12 2000 Owen Taylor + + * 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 * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c index e7d8cc4088..1350a43900 100644 --- a/gtk/gtkinvisible.c +++ b/gtk/gtkinvisible.c @@ -24,6 +24,7 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#include #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 7214ecf553..4ab0335239 100644 --- a/gtk/gtkinvisible.h +++ b/gtk/gtkinvisible.h @@ -27,10 +27,7 @@ #ifndef __GTK_INVISIBLE_H__ #define __GTK_INVISIBLE_H__ - -#include -#include - +#include #ifdef __cplusplus extern "C" { diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 3f7b4c9de3..001b1c8192 100644 --- 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)); } -- cgit v1.2.1