From 18ce1ade26838d5945bdec9a260a4ad1f0c938ce Mon Sep 17 00:00:00 2001 From: Lars Hamann Date: Thu, 22 Oct 1998 21:00:01 +0000 Subject: [PATCH] removed. gtk_clist_destroy is sufficient Thu Oct 22 22:40:35 1998 Lars Hamann * gtk/gtkctree.c (gtk_ctree_destroy): removed. gtk_clist_destroy is sufficient --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkctree.c | 40 ---------------------------------------- 8 files changed, 35 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d4c49df17..84934909d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 22 22:40:35 1998 Lars Hamann + + * gtk/gtkctree.c (gtk_ctree_destroy): removed. gtk_clist_destroy + is sufficient + Thu Oct 22 16:22:55 1998 Lars Hamann * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4d4c49df17..84934909d3 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Thu Oct 22 22:40:35 1998 Lars Hamann + + * gtk/gtkctree.c (gtk_ctree_destroy): removed. gtk_clist_destroy + is sufficient + Thu Oct 22 16:22:55 1998 Lars Hamann * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4d4c49df17..84934909d3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Oct 22 22:40:35 1998 Lars Hamann + + * gtk/gtkctree.c (gtk_ctree_destroy): removed. gtk_clist_destroy + is sufficient + Thu Oct 22 16:22:55 1998 Lars Hamann * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4d4c49df17..84934909d3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Thu Oct 22 22:40:35 1998 Lars Hamann + + * gtk/gtkctree.c (gtk_ctree_destroy): removed. gtk_clist_destroy + is sufficient + Thu Oct 22 16:22:55 1998 Lars Hamann * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4d4c49df17..84934909d3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Oct 22 22:40:35 1998 Lars Hamann + + * gtk/gtkctree.c (gtk_ctree_destroy): removed. gtk_clist_destroy + is sufficient + Thu Oct 22 16:22:55 1998 Lars Hamann * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4d4c49df17..84934909d3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Oct 22 22:40:35 1998 Lars Hamann + + * gtk/gtkctree.c (gtk_ctree_destroy): removed. gtk_clist_destroy + is sufficient + Thu Oct 22 16:22:55 1998 Lars Hamann * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4d4c49df17..84934909d3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Oct 22 22:40:35 1998 Lars Hamann + + * gtk/gtkctree.c (gtk_ctree_destroy): removed. gtk_clist_destroy + is sufficient + Thu Oct 22 16:22:55 1998 Lars Hamann * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index a3799e5c87..2f5d3e6194 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -49,7 +49,6 @@ static void gtk_ctree_class_init (GtkCTreeClass *klass); static void gtk_ctree_init (GtkCTree *ctree); -static void gtk_ctree_destroy (GtkObject *object); static void gtk_ctree_realize (GtkWidget *widget); static void gtk_ctree_unrealize (GtkWidget *widget); static gint gtk_ctree_button_press (GtkWidget *widget, @@ -353,8 +352,6 @@ gtk_ctree_class_init (GtkCTreeClass *klass) gtk_object_class_add_signals (object_class, ctree_signals, LAST_SIGNAL); - object_class->destroy = gtk_ctree_destroy; - widget_class->realize = gtk_ctree_realize; widget_class->unrealize = gtk_ctree_unrealize; widget_class->button_press_event = gtk_ctree_button_press; @@ -453,43 +450,6 @@ gtk_ctree_init (GtkCTree *ctree) ctree->show_stub = TRUE; } -static void -gtk_ctree_destroy (GtkObject *object) -{ - gint i; - GtkCList *clist; - - g_return_if_fail (object != NULL); - g_return_if_fail (GTK_IS_CTREE (object)); - - clist = GTK_CLIST (object); - - GTK_CLIST_SET_FLAG (clist, CLIST_FROZEN); - - gtk_clist_clear (GTK_CLIST (object)); - - if (clist->vscrollbar) - { - gtk_widget_unparent (clist->vscrollbar); - clist->vscrollbar = NULL; - } - if (clist->hscrollbar) - { - gtk_widget_unparent (clist->hscrollbar); - clist->hscrollbar = NULL; - } - - for (i = 0; i < clist->columns; i++) - if (clist->column[i].button) - { - gtk_widget_unparent (clist->column[i].button); - clist->column[i].button = NULL; - } - - if (GTK_OBJECT_CLASS (container_class)->destroy) - (*GTK_OBJECT_CLASS (container_class)->destroy) (object); -} - static void ctree_attach_styles (GtkCTree *ctree, GtkCTreeNode *node,