summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkclist.c3
-rw-r--r--gtk/gtkcontainer.c9
-rw-r--r--gtk/gtkfilechooserbutton.c3
-rw-r--r--gtk/gtkgamma.c3
-rw-r--r--gtk/gtkhandlebox.c12
-rw-r--r--gtk/gtkmenutoolbutton.c5
-rw-r--r--gtk/gtkoptionmenu.c3
-rw-r--r--gtk/gtkradiobutton.c5
-rw-r--r--gtk/gtkradiomenuitem.c5
-rw-r--r--gtk/gtktipsquery.c3
-rw-r--r--gtk/gtktree.c5
-rw-r--r--gtk/gtktreeview.c3
12 files changed, 18 insertions, 41 deletions
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index d4c274cb0e..d8350a3694 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -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
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index ddaee28f14..64b296e6c3 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -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
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index aa1b114e7a..68daa9fea6 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -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);
}
diff --git a/gtk/gtkgamma.c b/gtk/gtkgamma.c
index fb733c852a..6bc00404ad 100644
--- a/gtk/gtkgamma.c
+++ b/gtk/gtkgamma.c
@@ -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__
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index d5188a4334..77ffe56634 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.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;
@@ -348,13 +343,6 @@ gtk_handle_box_new (void)
}
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)
{
GtkBin *bin;
diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index b3d7ab25e0..d3c347f2c2 100644
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -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);
}
/**
diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 896d17ae71..4e63e0d55c 100644
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -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
diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index 6fd857dece..0d7277846b 100644
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -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
diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c
index 6e7579c9a4..0b33dc6c93 100644
--- a/gtk/gtkradiomenuitem.c
+++ b/gtk/gtkradiomenuitem.c
@@ -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
diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c
index 73b7fdc537..fea78d6f26 100644
--- a/gtk/gtktipsquery.c
+++ b/gtk/gtktipsquery.c
@@ -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*
diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index 663a2b58aa..b6a96a053a 100644
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -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
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 4aa6c195f9..8257216c27 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -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);
}
View Lorry Controller Status