From b6714d9ad10271ddf9bce070382ceb9df922a4a4 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Mon, 11 Jan 1999 06:35:41 +0000 Subject: [PATCH] added an assertement. 1999-01-11 Tim Janik * gtk/gtkmain.c (gtk_propagate_event): added an assertement. --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtkmain.c | 3 ++- 8 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5af9a5897..66310e738 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1999-01-11 Tim Janik + + * gtk/gtkmain.c (gtk_propagate_event): added an assertement. + Sun Jan 10 14:45:37 1999 Owen Taylor * gtk/gtktext.c (text_properties_equal): Fixed diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5af9a5897..66310e738 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +1999-01-11 Tim Janik + + * gtk/gtkmain.c (gtk_propagate_event): added an assertement. + Sun Jan 10 14:45:37 1999 Owen Taylor * gtk/gtktext.c (text_properties_equal): Fixed diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5af9a5897..66310e738 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +1999-01-11 Tim Janik + + * gtk/gtkmain.c (gtk_propagate_event): added an assertement. + Sun Jan 10 14:45:37 1999 Owen Taylor * gtk/gtktext.c (text_properties_equal): Fixed diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5af9a5897..66310e738 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +1999-01-11 Tim Janik + + * gtk/gtkmain.c (gtk_propagate_event): added an assertement. + Sun Jan 10 14:45:37 1999 Owen Taylor * gtk/gtktext.c (text_properties_equal): Fixed diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5af9a5897..66310e738 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +1999-01-11 Tim Janik + + * gtk/gtkmain.c (gtk_propagate_event): added an assertement. + Sun Jan 10 14:45:37 1999 Owen Taylor * gtk/gtktext.c (text_properties_equal): Fixed diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5af9a5897..66310e738 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +1999-01-11 Tim Janik + + * gtk/gtkmain.c (gtk_propagate_event): added an assertement. + Sun Jan 10 14:45:37 1999 Owen Taylor * gtk/gtktext.c (text_properties_equal): Fixed diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5af9a5897..66310e738 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +1999-01-11 Tim Janik + + * gtk/gtkmain.c (gtk_propagate_event): added an assertement. + Sun Jan 10 14:45:37 1999 Owen Taylor * gtk/gtktext.c (text_properties_equal): Fixed diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 841ae1e97..57f78d517 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -1201,6 +1201,7 @@ gtk_propagate_event (GtkWidget *widget, gint handled_event; g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (event != NULL); handled_event = FALSE; @@ -1215,7 +1216,7 @@ gtk_propagate_event (GtkWidget *widget, */ GtkWidget *window; - window = gtk_widget_get_ancestor (widget, gtk_window_get_type ()); + window = gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW); if (window) { if (GTK_WIDGET_IS_SENSITIVE (window))