Other patch by Johan to comment out a warning. Thanks Johan!

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

diff --git a/src/svg-view.cpp b/src/svg-view.cpp
index 5da24df98b18a69f6c2c75a39c38758a67be4396..bd46dd17a6c86645eec790878106b47d4ce9ca28 100644 (file)
--- a/src/svg-view.cpp
+++ b/src/svg-view.cpp
@@ -39,7 +39,7 @@ SPSVGView::SPSVGView (SPCanvasGroup *parent)
 
 SPSVGView::~SPSVGView()
 {
-    if (doc() && _drawing) 
+    if (doc() && _drawing)
     {
         sp_item_invoke_hide (SP_ITEM (sp_document_root (doc())), _dkey);
         _drawing = NULL;
@@ -63,7 +63,7 @@ SPSVGView::setScale (gdouble hscale, gdouble vscale)
  * Rescales SPSVGView and keeps aspect ratio.
  */
 void
-SPSVGView::setRescale 
+SPSVGView::setRescale
 (bool rescale, bool keepaspect, gdouble width, gdouble height)
 {
     g_return_if_fail (!rescale || (width >= 0.0));
@@ -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,7 +129,7 @@ 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 gboolean active = FALSE;
@@ -147,7 +147,7 @@ arena_handler (SPCanvasArena *arena, NRArenaItem *ai, GdkEvent *event, SPSVGView
                break;
        case GDK_BUTTON_RELEASE:
                if (event->button.button == 1) {
-                       if (active && (event->button.x == x) && 
+                       if (active && (event->button.x == x) &&
                                       (event->button.y == y)) {
                                spev.type = SP_EVENT_ACTIVATE;
                                 if ( spitem != 0 )
@@ -201,14 +201,13 @@ SPSVGView::setDocument (SPDocument *document)
 
     if (document) {
         NRArenaItem *ai = sp_item_invoke_show (
-                SP_ITEM (sp_document_root (document)), 
+                SP_ITEM (sp_document_root (document)),
                 SP_CANVAS_ARENA (_drawing)->arena,
-                _dkey, 
+                _dkey,
                 SP_ITEM_SHOW_DISPLAY);
-        
+
         if (ai) {
             nr_arena_item_add_child (SP_CANVAS_ARENA (_drawing)->root, ai, NULL);
-            nr_arena_item_unref (ai);
         }
 
         doRescale (!_rescale);