diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-05-19 20:02:45 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-05-19 20:02:45 +0000 |
| commit | b197dddddd9fb376198631b807c4bd770c6ff192 (patch) | |
| tree | f02dc17288db96d4c39a76c6ab6287eea82e39c6 /src/display/canvas-text.cpp | |
| parent | GTK+ 3 changes for sp-widget (diff) | |
| download | inkscape-b197dddddd9fb376198631b807c4bd770c6ff192.tar.gz inkscape-b197dddddd9fb376198631b807c4bd770c6ff192.zip | |
Revert r11370. Fix crash with grid in default template
Fixed bugs:
- https://launchpad.net/bugs/1001724
(bzr r11386)
Diffstat (limited to 'src/display/canvas-text.cpp')
| -rw-r--r-- | src/display/canvas-text.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp index b792b775d..f7a8713b6 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_dispose(GObject *object); +static void sp_canvastext_destroy (GtkObject *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) { - GObjectClass *object_class = (GObjectClass *) klass; + GtkObjectClass *object_class = (GtkObjectClass *) klass; SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass; parent_class_ct = (SPCanvasItemClass*)g_type_class_peek_parent (klass); - object_class->dispose = sp_canvastext_dispose; + object_class->destroy = sp_canvastext_destroy; item_class->update = sp_canvastext_update; item_class->render = sp_canvastext_render; @@ -93,7 +93,8 @@ 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_dispose(GObject *object) +static void +sp_canvastext_destroy (GtkObject *object) { g_return_if_fail (object != NULL); g_return_if_fail (SP_IS_CANVASTEXT (object)); @@ -104,8 +105,8 @@ static void sp_canvastext_dispose(GObject *object) canvastext->text = NULL; canvastext->item = NULL; - if (G_OBJECT_CLASS (parent_class_ct)->dispose) - (* G_OBJECT_CLASS (parent_class_ct)->dispose) (object); + if (GTK_OBJECT_CLASS (parent_class_ct)->destroy) + (* GTK_OBJECT_CLASS (parent_class_ct)->destroy) (object); } static void |