summaryrefslogtreecommitdiff
path: root/gtk/gtkframe.c
diff options
context:
space:
mode:
Diffstat (limited to 'gtk/gtkframe.c')
-rw-r--r--gtk/gtkframe.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 04c622d70d..5fc6aaea6d 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -35,7 +35,7 @@ static void gtk_frame_set_arg (GtkFrame *frame,
static void gtk_frame_get_arg (GtkFrame *frame,
GtkArg *arg,
guint arg_id);
-static void gtk_frame_destroy (GtkObject *object);
+static void gtk_frame_finalize (GtkObject *object);
static void gtk_frame_paint (GtkWidget *widget,
GdkRectangle *area);
static void gtk_frame_draw (GtkWidget *widget,
@@ -91,7 +91,7 @@ gtk_frame_class_init (GtkFrameClass *class)
gtk_object_add_arg_type ("GtkFrame::label_yalign", GTK_TYPE_DOUBLE, ARG_LABEL_YALIGN);
gtk_object_add_arg_type ("GtkFrame::shadow", GTK_TYPE_ENUM, ARG_SHADOW);
- object_class->destroy = gtk_frame_destroy;
+ object_class->finalize = gtk_frame_finalize;
widget_class->draw = gtk_frame_draw;
widget_class->expose_event = gtk_frame_expose;
@@ -279,7 +279,7 @@ gtk_frame_set_shadow_type (GtkFrame *frame,
static void
-gtk_frame_destroy (GtkObject *object)
+gtk_frame_finalize (GtkObject *object)
{
GtkFrame *frame;
@@ -291,8 +291,7 @@ gtk_frame_destroy (GtkObject *object)
if (frame->label)
g_free (frame->label);
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ (* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
}
static void