Commit 8371b465 authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

gtk/gtkclist.c gtk/gtkcontainer.c gtk/gtkfilechooserbutton.c

2008-08-07  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkclist.c
	* gtk/gtkcontainer.c
	* gtk/gtkfilechooserbutton.c
	* gtk/gtkgamma.c
	* gtk/gtkmenutoolbutton.c
	* gtk/gtkoptionmenu.c
	* gtk/gtkradiobutton.c
	* gtk/gtkradiomenuitem.c
	* gtk/gtktipsquery.c
	* gtk/gtktree.c
	* gtk/gtktreeview.c: chain up unconditionally in destroy().

	* gtk/gtkhandlebox.c: remove empty destroy() implementation.


svn path=/trunk/; revision=21035
parent 141af56c
2008-08-07 Michael Natterer <mitch@imendio.com>
* gtk/gtkclist.c
* gtk/gtkcontainer.c
* gtk/gtkfilechooserbutton.c
* gtk/gtkgamma.c
* gtk/gtkmenutoolbutton.c
* gtk/gtkoptionmenu.c
* gtk/gtkradiobutton.c
* gtk/gtkradiomenuitem.c
* gtk/gtktipsquery.c
* gtk/gtktree.c
* gtk/gtktreeview.c: chain up unconditionally in destroy().
* gtk/gtkhandlebox.c: remove empty destroy() implementation.
2008-08-07 Michael Natterer <mitch@imendio.com>
Bug 546756 – gnome-panel crashed with SIGSEGV in
......
......@@ -4402,8 +4402,7 @@ gtk_clist_destroy (GtkObject *object)
clist->column[i].button = NULL;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
static void
......
......@@ -1009,7 +1009,7 @@ static void
gtk_container_destroy (GtkObject *object)
{
GtkContainer *container = GTK_CONTAINER (object);
if (GTK_CONTAINER_RESIZE_PENDING (container))
_gtk_container_dequeue_resize_handler (container);
......@@ -1018,11 +1018,10 @@ gtk_container_destroy (GtkObject *object)
*/
if (container->has_focus_chain)
gtk_container_unset_focus_chain (container);
gtk_container_foreach (container, (GtkCallback) gtk_widget_destroy, NULL);
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
static void
......
......@@ -954,8 +954,7 @@ gtk_file_chooser_button_destroy (GtkObject *object)
priv->fs = NULL;
}
if (GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy != NULL)
(*GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy) (object);
GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy (object);
}
......
......@@ -485,8 +485,7 @@ gtk_gamma_curve_destroy (GtkObject *object)
if (c->gamma_dialog)
gtk_widget_destroy (c->gamma_dialog);
if (GTK_OBJECT_CLASS (gtk_gamma_curve_parent_class)->destroy)
(* GTK_OBJECT_CLASS (gtk_gamma_curve_parent_class)->destroy) (object);
GTK_OBJECT_CLASS (gtk_gamma_curve_parent_class)->destroy (object);
}
#define __GTK_GAMMA_CURVE_C__
......
......@@ -113,7 +113,6 @@ static void gtk_handle_box_get_property (GObject *object,
guint param_id,
GValue *value,
GParamSpec *pspec);
static void gtk_handle_box_destroy (GtkObject *object);
static void gtk_handle_box_map (GtkWidget *widget);
static void gtk_handle_box_unmap (GtkWidget *widget);
static void gtk_handle_box_realize (GtkWidget *widget);
......@@ -152,12 +151,10 @@ static void
gtk_handle_box_class_init (GtkHandleBoxClass *class)
{
GObjectClass *gobject_class;
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
gobject_class = (GObjectClass *) class;
object_class = (GtkObjectClass *) class;
widget_class = (GtkWidgetClass *) class;
container_class = (GtkContainerClass *) class;
......@@ -214,8 +211,6 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
FALSE,
GTK_PARAM_READABLE));
object_class->destroy = gtk_handle_box_destroy;
widget_class->map = gtk_handle_box_map;
widget_class->unmap = gtk_handle_box_unmap;
widget_class->realize = gtk_handle_box_realize;
......@@ -347,13 +342,6 @@ gtk_handle_box_new (void)
return g_object_new (GTK_TYPE_HANDLE_BOX, NULL);
}
static void
gtk_handle_box_destroy (GtkObject *object)
{
if (GTK_OBJECT_CLASS (gtk_handle_box_parent_class)->destroy)
(* GTK_OBJECT_CLASS (gtk_handle_box_parent_class)->destroy) (object);
}
static void
gtk_handle_box_map (GtkWidget *widget)
{
......
......@@ -423,9 +423,8 @@ gtk_menu_tool_button_destroy (GtkObject *object)
arrow_button_button_press_event_cb,
button);
}
if (GTK_OBJECT_CLASS (gtk_menu_tool_button_parent_class)->destroy)
(*GTK_OBJECT_CLASS (gtk_menu_tool_button_parent_class)->destroy) (object);
GTK_OBJECT_CLASS (gtk_menu_tool_button_parent_class)->destroy (object);
}
/**
......
......@@ -377,8 +377,7 @@ gtk_option_menu_destroy (GtkObject *object)
if (option_menu->menu)
gtk_widget_destroy (option_menu->menu);
if (GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy)
(* GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy) (object);
GTK_OBJECT_CLASS (gtk_option_menu_parent_class)->destroy (object);
}
static void
......
......@@ -384,9 +384,8 @@ gtk_radio_button_destroy (GtkObject *object)
g_signal_emit (old_group_singleton, group_changed_signal, 0);
if (was_in_group)
g_signal_emit (radio_button, group_changed_signal, 0);
if (GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy)
(* GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy) (object);
GTK_OBJECT_CLASS (gtk_radio_button_parent_class)->destroy (object);
}
static void
......
......@@ -410,9 +410,8 @@ gtk_radio_menu_item_destroy (GtkObject *object)
g_signal_emit (old_group_singleton, group_changed_signal, 0);
if (was_in_group)
g_signal_emit (radio_menu_item, group_changed_signal, 0);
if (GTK_OBJECT_CLASS (gtk_radio_menu_item_parent_class)->destroy)
(* GTK_OBJECT_CLASS (gtk_radio_menu_item_parent_class)->destroy) (object);
GTK_OBJECT_CLASS (gtk_radio_menu_item_parent_class)->destroy (object);
}
static void
......
......@@ -265,8 +265,7 @@ gtk_tips_query_destroy (GtkObject *object)
g_free (tips_query->label_no_tip);
tips_query->label_no_tip = NULL;
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
GtkWidget*
......
......@@ -408,9 +408,8 @@ gtk_tree_destroy (GtkObject *object)
g_list_free (tree->selection);
tree->selection = NULL;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
static void
......
......@@ -1692,8 +1692,7 @@ gtk_tree_view_destroy (GtkObject *object)
tree_view->priv->vadjustment = NULL;
}
if (GTK_OBJECT_CLASS (gtk_tree_view_parent_class)->destroy)
(* GTK_OBJECT_CLASS (gtk_tree_view_parent_class)->destroy) (object);
GTK_OBJECT_CLASS (gtk_tree_view_parent_class)->destroy (object);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment