diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2011-06-13 00:28:49 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2011-06-13 00:28:49 +0000 |
| commit | a1f1e29a8a207ea7ef4be583a050778cf2875217 (patch) | |
| tree | 6245cf5267ec118a7e3c429dd83949256940b8b7 /src/display | |
| parent | cmake: basic install target (diff) | |
| download | inkscape-a1f1e29a8a207ea7ef4be583a050778cf2875217.tar.gz inkscape-a1f1e29a8a207ea7ef4be583a050778cf2875217.zip | |
Replace deprecated GtkSignal
(bzr r10282.1.1)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/canvas-arena.cpp | 9 | ||||
| -rw-r--r-- | src/display/sp-canvas.cpp | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp index 5975db9cc..8436a3b99 100644 --- a/src/display/canvas-arena.cpp +++ b/src/display/canvas-arena.cpp @@ -77,10 +77,11 @@ sp_canvas_arena_class_init (SPCanvasArenaClass *klass) parent_class = (SPCanvasItemClass*)gtk_type_class (SP_TYPE_CANVAS_ITEM); - signals[ARENA_EVENT] = gtk_signal_new ("arena_event", - GTK_RUN_LAST, - GTK_CLASS_TYPE(object_class), + signals[ARENA_EVENT] = g_signal_new ("arena_event", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, ((glong)((guint8*)&(klass->arena_event) - (guint8*)klass)), + NULL, NULL, sp_marshal_INT__POINTER_POINTER, GTK_TYPE_INT, 2, GTK_TYPE_POINTER, GTK_TYPE_POINTER); @@ -329,7 +330,7 @@ sp_canvas_arena_send_event (SPCanvasArena *arena, GdkEvent *event) gint ret = FALSE; /* Send event to arena */ - gtk_signal_emit (GTK_OBJECT (arena), signals[ARENA_EVENT], arena->active, event, &ret); + g_signal_emit (G_OBJECT (arena), signals[ARENA_EVENT], 0, arena->active, event, &ret); return ret; } diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index ad2a45eea..20c21a8c3 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -1360,7 +1360,7 @@ emit_event (SPCanvas *canvas, GdkEvent *event) while (item && !finished) { gtk_object_ref (GTK_OBJECT (item)); - gtk_signal_emit (GTK_OBJECT (item), item_signals[ITEM_EVENT], &ev, &finished); + g_signal_emit (G_OBJECT (item), item_signals[ITEM_EVENT], 0, &ev, &finished); SPCanvasItem *parent = item->parent; gtk_object_unref (GTK_OBJECT (item)); item = parent; |