From eecfff186b90f9ac3ccda94658de90ddacd44fbb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 28 May 2004 19:01:20 +0000 Subject: [PATCH] Add informative messages for common problems. (#137974, Owen Taylor) Fri May 28 14:57:13 2004 Matthias Clasen * gtk/gtkwidget.c (gtk_widget_set_parent): Add informative messages for common problems. (#137974, Owen Taylor) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkwidget.c | 12 ++++++++++-- 5 files changed, 30 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f7bee17a5..ea864865a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri May 28 15:00:01 2004 Matthias Clasen + + * gtk/gtkwidget.c (gtk_widget_set_parent): Add informative + messages for common problems. (#137974, Owen Taylor) + Fri May 28 14:20:17 2004 Matthias Clasen * gdk/x11/gdkevents-x11.c: Fix off-by-one allocation diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9f7bee17a5..ea864865a7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri May 28 15:00:01 2004 Matthias Clasen + + * gtk/gtkwidget.c (gtk_widget_set_parent): Add informative + messages for common problems. (#137974, Owen Taylor) + Fri May 28 14:20:17 2004 Matthias Clasen * gdk/x11/gdkevents-x11.c: Fix off-by-one allocation diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9f7bee17a5..ea864865a7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri May 28 15:00:01 2004 Matthias Clasen + + * gtk/gtkwidget.c (gtk_widget_set_parent): Add informative + messages for common problems. (#137974, Owen Taylor) + Fri May 28 14:20:17 2004 Matthias Clasen * gdk/x11/gdkevents-x11.c: Fix off-by-one allocation diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9f7bee17a5..ea864865a7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri May 28 15:00:01 2004 Matthias Clasen + + * gtk/gtkwidget.c (gtk_widget_set_parent): Add informative + messages for common problems. (#137974, Owen Taylor) + Fri May 28 14:20:17 2004 Matthias Clasen * gdk/x11/gdkevents-x11.c: Fix off-by-one allocation diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index d1f5208fdb..75d252da02 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -4253,10 +4253,18 @@ gtk_widget_set_parent (GtkWidget *widget, GtkStateData data; g_return_if_fail (GTK_IS_WIDGET (widget)); - g_return_if_fail (widget->parent == NULL); - g_return_if_fail (!GTK_WIDGET_TOPLEVEL (widget)); g_return_if_fail (GTK_IS_WIDGET (parent)); g_return_if_fail (widget != parent); + if (widget->parent != NULL) + { + g_warning ("Can't set a parent on widget which has a parent\n"); + return; + } + if (GTK_WIDGET_TOPLEVEL (widget)) + { + g_warning ("Can't set a parent on a toplevel widget\n"); + return; + } /* keep this function in sync with gtk_menu_attach_to_widget() */