diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index bab39d332b6bddd84a49890b6efe2ccb0ffb6e94..41a45eec263c45e7dcbcd688e742ff62d5970890 100644 (file)
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
/* Root item handler */
-
int sp_desktop_root_handler(SPCanvasItem *item, GdkEvent *event, SPDesktop *desktop)
{
return sp_event_context_root_handler(desktop->event_context, event);
}
-/*
- * fixme: this conatins a hack, to deal with deleting a view, which is
- * completely on another view, in which case active_desktop will not be updated
- *
- */
-
-int sp_desktop_item_handler(SPCanvasItem *item, GdkEvent *event, gpointer data)
-{
- gpointer ddata = gtk_object_get_data(GTK_OBJECT(item->canvas), "SPDesktop");
- g_return_val_if_fail(ddata != NULL, FALSE);
-
- SPDesktop *desktop = static_cast<SPDesktop*>(ddata);
-
- return sp_event_context_item_handler(desktop->event_context, SP_ITEM(data), event);
-}
-
static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw, bool horiz)
{
guide = sp_guideline_new(desktop->guides, guide_pos_dt, !horiz);
sp_guideline_set_color(SP_GUIDELINE(guide), desktop->namedview->guidehicolor);
gdk_pointer_grab(widget->window, FALSE,
- (GdkEventMask)(GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK),
+ (GdkEventMask)(GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK ),
NULL, NULL,
event->button.time);
}
@@ -123,7 +106,8 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
sp_repr_set_svg_double(repr, "position", guide_pos_dt);
SP_OBJECT_REPR(desktop->namedview)->appendChild(repr);
Inkscape::GC::release(repr);
- sp_document_done(sp_desktop_document(desktop));
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
+ /* TODO: annotate */ "desktop-events.cpp:127");
}
desktop->set_coordinate_status(event_dt);
}
sp_canvas_item_grab(item,
( GDK_BUTTON_RELEASE_MASK |
GDK_BUTTON_PRESS_MASK |
- GDK_POINTER_MOTION_MASK |
- GDK_POINTER_MOTION_HINT_MASK ),
+ GDK_POINTER_MOTION_MASK ),
NULL,
event->button.time);
ret = TRUE;
sp_guide_remove(guide);
}
moved = false;
- sp_document_done(sp_desktop_document(desktop));
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_NONE,
+ /* TODO: annotate */ "desktop-events.cpp:207");
desktop->set_coordinate_status(event_dt);
desktop->setPosition (event_dt);
}