From bb396a07b29016fcfa40e689f47461fa5086b62b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 6 Jul 2008 22:24:24 +0000 Subject: [PATCH] Remove erroneously added g_return_if_fail (bug #541811). 2008-07-07 Christian Dywan * gtk/gtkcontainer.c (gtk_container_add_with_properties): Remove erroneously added g_return_if_fail (bug #541811). svn path=/trunk/; revision=20792 --- ChangeLog | 5 +++++ gtk/gtkcomboboxentry.c | 12 ++++++++++++ gtk/gtkcontainer.c | 1 - 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 73b8dc2da0..c71b3856c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-07-07 Christian Dywan + + * gtk/gtkcontainer.c (gtk_container_add_with_properties): Remove + erroneously added g_return_if_fail (bug #541811). + 2008-07-06 Matthias Clasen Bug 343663 – source-buffer highlighting highlights "char" in diff --git a/gtk/gtkcomboboxentry.c b/gtk/gtkcomboboxentry.c index fe77f52bf5..9d76e4e94d 100644 --- a/gtk/gtkcomboboxentry.c +++ b/gtk/gtkcomboboxentry.c @@ -50,6 +50,7 @@ static void gtk_combo_box_entry_add (GtkContainer *contain GtkWidget *child); static void gtk_combo_box_entry_remove (GtkContainer *container, GtkWidget *child); +static GType gtk_combo_box_entry_child_type (GtkContainer *container); static gchar *gtk_combo_box_entry_get_active_text (GtkComboBox *combo_box); static void gtk_combo_box_entry_active_changed (GtkComboBox *combo_box, @@ -96,6 +97,7 @@ gtk_combo_box_entry_class_init (GtkComboBoxEntryClass *klass) container_class = (GtkContainerClass *)klass; container_class->add = gtk_combo_box_entry_add; container_class->remove = gtk_combo_box_entry_remove; + container_class->child_type = gtk_combo_box_entry_child_type; combo_class = (GtkComboBoxClass *)klass; combo_class->get_active_text = gtk_combo_box_entry_get_active_text; @@ -236,6 +238,16 @@ gtk_combo_box_entry_remove (GtkContainer *container, GTK_CONTAINER_CLASS (gtk_combo_box_entry_parent_class)->remove (container, child); } +static GType +gtk_combo_box_entry_child_type (GtkContainer *container) +{ + if (!GTK_BIN (container)->child) + return GTK_TYPE_ENTRY; + else + return G_TYPE_NONE; +} + + static void gtk_combo_box_entry_active_changed (GtkComboBox *combo_box, gpointer user_data) diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index a93ddeec7c..19fe7c0c2c 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -819,7 +819,6 @@ gtk_container_add_with_properties (GtkContainer *container, g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (widget->parent == NULL); - g_return_if_fail (widget->parent == container); g_object_ref (container); g_object_ref (widget);