diff options
Diffstat (limited to 'src/display/canvas-text.cpp')
| -rw-r--r-- | src/display/canvas-text.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp index f7a8713b6..b792b775d 100644 --- a/src/display/canvas-text.cpp +++ b/src/display/canvas-text.cpp @@ -28,7 +28,7 @@ static void sp_canvastext_class_init (SPCanvasTextClass *klass); static void sp_canvastext_init (SPCanvasText *canvastext); -static void sp_canvastext_destroy (GtkObject *object); +static void sp_canvastext_dispose(GObject *object); static void sp_canvastext_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags); static void sp_canvastext_render (SPCanvasItem *item, SPCanvasBuf *buf); @@ -59,12 +59,12 @@ sp_canvastext_get_type (void) static void sp_canvastext_class_init (SPCanvasTextClass *klass) { - GtkObjectClass *object_class = (GtkObjectClass *) klass; + GObjectClass *object_class = (GObjectClass *) klass; SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass; parent_class_ct = (SPCanvasItemClass*)g_type_class_peek_parent (klass); - object_class->destroy = sp_canvastext_destroy; + object_class->dispose = sp_canvastext_dispose; item_class->update = sp_canvastext_update; item_class->render = sp_canvastext_render; @@ -93,8 +93,7 @@ sp_canvastext_init (SPCanvasText *canvastext) canvastext->border = 3; // must be a constant, and not proportional to any width, height, or fontsize to allow alignment with other text boxes } -static void -sp_canvastext_destroy (GtkObject *object) +static void sp_canvastext_dispose(GObject *object) { g_return_if_fail (object != NULL); g_return_if_fail (SP_IS_CANVASTEXT (object)); @@ -105,8 +104,8 @@ sp_canvastext_destroy (GtkObject *object) canvastext->text = NULL; canvastext->item = NULL; - if (GTK_OBJECT_CLASS (parent_class_ct)->destroy) - (* GTK_OBJECT_CLASS (parent_class_ct)->destroy) (object); + if (G_OBJECT_CLASS (parent_class_ct)->dispose) + (* G_OBJECT_CLASS (parent_class_ct)->dispose) (object); } static void |