From c084c71294539f17421eff2a0e39992ec1914afe Mon Sep 17 00:00:00 2001 From: 1 Date: Tue, 1 Jun 1999 17:26:26 +0000 Subject: [PATCH] added return if fail for invalid window types. 1999-06-01 * gtk/gtkwindow.c (gtk_window_new): added return if fail for invalid window types. * examples/packer/pack.c (main): use GTK_WINDOW_TOPLEVEL instead of GTK_TOPLEVEL for creating the window. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ examples/packer/Makefile | 2 +- examples/packer/pack.c | 2 +- gtk/gtkwindow.c | 4 +++- 10 files changed, 61 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc637c6b78..cea888b1b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1999-06-01 + + * gtk/gtkwindow.c (gtk_window_new): added return if fail for invalid + window types. + + * examples/packer/pack.c (main): use GTK_WINDOW_TOPLEVEL instead + of GTK_TOPLEVEL for creating the window. + 1999-06-01 * gtk/gtkmain.c (gtk_init_check): don't segfault when --gtk-module is diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bc637c6b78..cea888b1b3 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +1999-06-01 + + * gtk/gtkwindow.c (gtk_window_new): added return if fail for invalid + window types. + + * examples/packer/pack.c (main): use GTK_WINDOW_TOPLEVEL instead + of GTK_TOPLEVEL for creating the window. + 1999-06-01 * gtk/gtkmain.c (gtk_init_check): don't segfault when --gtk-module is diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bc637c6b78..cea888b1b3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +1999-06-01 + + * gtk/gtkwindow.c (gtk_window_new): added return if fail for invalid + window types. + + * examples/packer/pack.c (main): use GTK_WINDOW_TOPLEVEL instead + of GTK_TOPLEVEL for creating the window. + 1999-06-01 * gtk/gtkmain.c (gtk_init_check): don't segfault when --gtk-module is diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bc637c6b78..cea888b1b3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +1999-06-01 + + * gtk/gtkwindow.c (gtk_window_new): added return if fail for invalid + window types. + + * examples/packer/pack.c (main): use GTK_WINDOW_TOPLEVEL instead + of GTK_TOPLEVEL for creating the window. + 1999-06-01 * gtk/gtkmain.c (gtk_init_check): don't segfault when --gtk-module is diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bc637c6b78..cea888b1b3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +1999-06-01 + + * gtk/gtkwindow.c (gtk_window_new): added return if fail for invalid + window types. + + * examples/packer/pack.c (main): use GTK_WINDOW_TOPLEVEL instead + of GTK_TOPLEVEL for creating the window. + 1999-06-01 * gtk/gtkmain.c (gtk_init_check): don't segfault when --gtk-module is diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bc637c6b78..cea888b1b3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +1999-06-01 + + * gtk/gtkwindow.c (gtk_window_new): added return if fail for invalid + window types. + + * examples/packer/pack.c (main): use GTK_WINDOW_TOPLEVEL instead + of GTK_TOPLEVEL for creating the window. + 1999-06-01 * gtk/gtkmain.c (gtk_init_check): don't segfault when --gtk-module is diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bc637c6b78..cea888b1b3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +1999-06-01 + + * gtk/gtkwindow.c (gtk_window_new): added return if fail for invalid + window types. + + * examples/packer/pack.c (main): use GTK_WINDOW_TOPLEVEL instead + of GTK_TOPLEVEL for creating the window. + 1999-06-01 * gtk/gtkmain.c (gtk_init_check): don't segfault when --gtk-module is diff --git a/examples/packer/Makefile b/examples/packer/Makefile index f2cb96052e..b48f7ec793 100644 --- a/examples/packer/Makefile +++ b/examples/packer/Makefile @@ -2,7 +2,7 @@ CC = gcc packer: pack.c - $(CC) `gtk-config --cflags` pack.c -o packer `gtk-config --libs` + $(CC) -g `gtk-config --cflags` pack.c -o packer `gtk-config --libs` clean: rm -f *.o packer diff --git a/examples/packer/pack.c b/examples/packer/pack.c index e3200b22c7..6bde2f082b 100644 --- a/examples/packer/pack.c +++ b/examples/packer/pack.c @@ -81,7 +81,7 @@ main (int argv, char **argc) info = g_malloc(sizeof(Info)); - window = gtk_window_new(GTK_TOPLEVEL); + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_signal_connect (GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC (destroy), NULL); diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 2dd5960527..f4881c9dfb 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -322,7 +322,9 @@ gtk_window_new (GtkWindowType type) { GtkWindow *window; - window = gtk_type_new (gtk_window_get_type ()); + g_return_val_if_fail (type >= GTK_WINDOW_TOPLEVEL && type <= GTK_WINDOW_POPUP, NULL); + + window = gtk_type_new (GTK_TYPE_WINDOW); window->type = type;