Use cursor-tweak-move.xpm for all object modes and cursor-color.xpm

[inkscape.git] / src / svg-view.cpp

diff --git a/src/svg-view.cpp b/src/svg-view.cpp
index 254540aaacd65c31c526c1972df4864a34cb4c3e..bd46dd17a6c86645eec790878106b47d4ce9ca28 100644 (file)
--- a/src/svg-view.cpp
+++ b/src/svg-view.cpp
@@ -100,7 +100,7 @@ SPSVGView::doRescale (bool event)
     }
 
     if (_drawing) {
-        sp_canvas_item_affine_absolute (_drawing, NR::Matrix(NR::scale(_hscale, _vscale)));
+        sp_canvas_item_affine_absolute (_drawing, Geom::Scale(_hscale, _vscale));
     }
 
     if (event) {
@@ -114,7 +114,7 @@ SPSVGView::mouseover()
 {
     GdkCursor *cursor = gdk_cursor_new(GDK_HAND2);
     gdk_window_set_cursor(GTK_WIDGET(SP_CANVAS_ITEM(_drawing)->canvas)->window, cursor);
-    gdk_cursor_destroy(cursor);
+    gdk_cursor_unref(cursor);
 }
 
 void
@@ -129,10 +129,10 @@ SPSVGView::mouseout()
  */
 /// \todo fixme.
 static gint
-arena_handler (SPCanvasArena *arena, NRArenaItem *ai, GdkEvent *event, SPSVGView *svgview)
+arena_handler (SPCanvasArena */*arena*/, NRArenaItem *ai, GdkEvent *event, SPSVGView *svgview)
 {
        static gdouble x, y;
-       static bool active = FALSE;
+       static gboolean active = FALSE;
        SPEvent spev;
 
        SPItem *spitem = (ai) ? (SPItem*)NR_ARENA_ITEM_GET_DATA (ai) : 0;
@@ -208,7 +208,6 @@ SPSVGView::setDocument (SPDocument *document)
 
         if (ai) {
             nr_arena_item_add_child (SP_CANVAS_ARENA (_drawing)->root, ai, NULL);
-            nr_arena_item_unref (ai);
         }
 
         doRescale (!_rescale);