diff options
| author | Milan Crha <mcrha@redhat.com> | 2010-10-07 01:26:08 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2010-10-07 01:26:08 +0800 |
| commit | 1c6f2d154e74f908e2c4a137de0233b5faf4f6b6 (patch) | |
| tree | 77a33236e48ed59a7c7c65e8a1c91481dd09f3eb /libgnomecanvas/gnome-canvas-text.c | |
| parent | 1b2fefb086c3e34089beb8b89b22d79005cc7725 (diff) | |
| download | gsoc2013-evolution-1c6f2d154e74f908e2c4a137de0233b5faf4f6b6.tar.gz gsoc2013-evolution-1c6f2d154e74f908e2c4a137de0233b5faf4f6b6.tar.zst gsoc2013-evolution-1c6f2d154e74f908e2c4a137de0233b5faf4f6b6.zip | |
Bug #631320 - GtkObject is gone in GTK3
Diffstat (limited to 'libgnomecanvas/gnome-canvas-text.c')
| -rw-r--r-- | libgnomecanvas/gnome-canvas-text.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c index c0c9acba2b..5f7679f3aa 100644 --- a/libgnomecanvas/gnome-canvas-text.c +++ b/libgnomecanvas/gnome-canvas-text.c @@ -105,7 +105,7 @@ struct _GnomeCanvasTextPrivate { static void gnome_canvas_text_class_init (GnomeCanvasTextClass *class); static void gnome_canvas_text_init (GnomeCanvasText *text); -static void gnome_canvas_text_destroy (GtkObject *object); +static void gnome_canvas_text_destroy (GnomeCanvasItem *object); static void gnome_canvas_text_set_property (GObject *object, guint param_id, const GValue *value, @@ -187,11 +187,9 @@ static void gnome_canvas_text_class_init (GnomeCanvasTextClass *class) { GObjectClass *gobject_class; - GtkObjectClass *object_class; GnomeCanvasItemClass *item_class; gobject_class = (GObjectClass *) class; - object_class = (GtkObjectClass *) class; item_class = (GnomeCanvasItemClass *) class; parent_class = g_type_class_peek_parent (class); @@ -199,6 +197,7 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) gobject_class->set_property = gnome_canvas_text_set_property; gobject_class->get_property = gnome_canvas_text_get_property; + /* Text */ g_object_class_install_property (gobject_class, @@ -512,8 +511,7 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) "Whether this tag affects font scaling"); #undef ADD_SET_PROP - object_class->destroy = gnome_canvas_text_destroy; - + item_class->destroy = gnome_canvas_text_destroy; item_class->update = gnome_canvas_text_update; item_class->realize = gnome_canvas_text_realize; item_class->unrealize = gnome_canvas_text_unrealize; @@ -554,7 +552,7 @@ gnome_canvas_text_init (GnomeCanvasText *text) /* Destroy handler for the text item */ static void -gnome_canvas_text_destroy (GtkObject *object) +gnome_canvas_text_destroy (GnomeCanvasItem *object) { GnomeCanvasText *text; @@ -590,8 +588,8 @@ gnome_canvas_text_destroy (GtkObject *object) g_free (text->priv); text->priv = NULL; - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + if (GNOME_CANVAS_ITEM_CLASS (parent_class)->destroy) + GNOME_CANVAS_ITEM_CLASS (parent_class)->destroy (object); } static void |