r11451@tres: ted | 2006-04-17 22:21:33 -0700

[inkscape.git] / src / event-context.cpp

diff --git a/src/event-context.cpp b/src/event-context.cpp
index da430a2ed163d711f43eaa4caad3b428926aa968..d91a064bad17a234ac6822825927317fe1b63129 100644 (file)
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -170,7 +170,7 @@ sp_event_context_dispose(GObject *object)
 void
 sp_event_context_update_cursor(SPEventContext *ec)
 {
-    GtkWidget *w = GTK_WIDGET(SP_DT_CANVAS(ec->desktop));
+    GtkWidget *w = GTK_WIDGET(sp_desktop_canvas(ec->desktop));
     if (w->window) {
         /* fixme: */
         if (ec->cursor_shape) {
@@ -515,13 +515,6 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
                         ret = TRUE;
                     }
                     break;
-                    // FIXME: make import a verb
-                case GDK_i: // Ctrl i - import file
-                    if (MOD__CTRL_ONLY) {
-                        sp_file_import(NULL);
-                        ret = TRUE;
-                    }
-                    break;
                 case GDK_Left: // Ctrl Left
                 case GDK_KP_Left:
                 case GDK_KP_4:
@@ -875,7 +868,7 @@ sp_event_root_menu_popup(SPDesktop *desktop, SPItem *item, GdkEvent *event)
 
     /* fixme: This is not what I want but works for now (Lauris) */
     if (event->type == GDK_KEY_PRESS) {
-        item = SP_DT_SELECTION(desktop)->singleItem();
+        item = sp_desktop_selection(desktop)->singleItem();
     }
     menu = sp_ui_context_menu(desktop, item);
     gtk_widget_show(menu);
@@ -1013,7 +1006,7 @@ ec_shape_event_attr_changed(Inkscape::XML::Node *shape_repr, gchar const *name,
 
     SPDesktop *desktop = ec->desktop;
 
-    SPItem *item = SP_DT_SELECTION(desktop)->singleItem();
+    SPItem *item = sp_desktop_selection(desktop)->singleItem();
 
     if (item) {
         ec->shape_knot_holder = sp_item_knot_holder(item, desktop);