Merge and cleanup of GSoC C++-ification project.

[inkscape.git] / src / knot.cpp

diff --git a/src/knot.cpp b/src/knot.cpp
index 95a9ec1482b675614228b1c0bc2291aa0a597ae6..28c991fdec590cb479cc3df875db2493452acfa2 100644 (file)
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -1,11 +1,10 @@
-#define __SP_KNOT_C__
-
 /** \file
  * SPKnot implementation
  *
  * Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   bulia byak <buliabyak@users.sf.net>
+ *   Abhishek Sharma
  *
  * Copyright (C) 1999-2005 authors
  * Copyright (C) 2001-2002 Ximian, Inc.
@@ -29,6 +28,8 @@
 #include "message-context.h"
 #include "event-context.h"
 
+using Inkscape::DocumentUndo;
+
 #define KNOT_EVENT_MASK (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | \
                         GDK_POINTER_MOTION_MASK | \
                         GDK_POINTER_MOTION_HINT_MASK | \
@@ -427,7 +428,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
                                 g_signal_emit(knot,
                                               knot_signals[UNGRABBED], 0,
                                               event->button.state);
-                                SPDocumentUndo::undo(sp_desktop_document(knot->desktop));
+                                DocumentUndo::undo(sp_desktop_document(knot->desktop));
                                 knot->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Node or handle drag canceled."));
                                 transform_escaped = true;
                                 consumed = TRUE;
@@ -447,7 +448,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
 
     g_object_unref(knot);
 
-    return consumed;
+    return consumed || grabbed;
 }
 
 void sp_knot_handler_request_position(GdkEvent *event, SPKnot *knot)