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-arena.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-arena.cpp')
| -rw-r--r-- | src/display/canvas-arena.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp index 79629c2e2..9aa119be9 100644 --- a/src/display/canvas-arena.cpp +++ b/src/display/canvas-arena.cpp @@ -32,7 +32,7 @@ enum { static void sp_canvas_arena_class_init(SPCanvasArenaClass *klass); static void sp_canvas_arena_init(SPCanvasArena *group); -static void sp_canvas_arena_dispose(GObject *object); +static void sp_canvas_arena_destroy(GtkObject *object); static void sp_canvas_arena_item_deleted(SPCanvasArena *arena, Inkscape::DrawingItem *item); static void sp_canvas_arena_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags); @@ -93,8 +93,11 @@ sp_canvas_arena_get_type (void) static void sp_canvas_arena_class_init (SPCanvasArenaClass *klass) { - GObjectClass *object_class = (GObjectClass *) klass; - SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass; + GtkObjectClass *object_class; + SPCanvasItemClass *item_class; + + object_class = (GtkObjectClass *) klass; + item_class = (SPCanvasItemClass *) klass; parent_class = (SPCanvasItemClass*)g_type_class_peek_parent (klass); @@ -106,7 +109,8 @@ sp_canvas_arena_class_init (SPCanvasArenaClass *klass) sp_marshal_INT__POINTER_POINTER, G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_POINTER); - object_class->dispose = sp_canvas_arena_dispose; + object_class->destroy = sp_canvas_arena_destroy; + item_class->update = sp_canvas_arena_update; item_class->render = sp_canvas_arena_render; item_class->point = sp_canvas_arena_point; @@ -143,15 +147,16 @@ sp_canvas_arena_init (SPCanvasArena *arena) arena->active = NULL; } -static void sp_canvas_arena_dispose(GObject *object) +static void +sp_canvas_arena_destroy (GtkObject *object) { SPCanvasArena *arena = SP_CANVAS_ARENA (object); delete arena->observer; arena->drawing.~Drawing(); - if (G_OBJECT_CLASS(parent_class)->dispose) - (* G_OBJECT_CLASS(parent_class)->dispose) (object); + if (GTK_OBJECT_CLASS (parent_class)->destroy) + (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } static void |