summaryrefslogtreecommitdiffstats
path: root/src/knot.cpp
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2014-12-31 14:36:09 +0000
committer~suv <suv-sf@users.sourceforge.net>2014-12-31 14:36:09 +0000
commit02cb649c0ceebd254dde302eeba71406fb25a24c (patch)
tree4ccb52d7f06a7160adb2aaf1428d3a5a2acef9a5 /src/knot.cpp
parentpackaging/macosx: update local python ports (MacPorts drops support for Pytho... (diff)
parentFix for bug #758718 (Color Picker/Dropper: Color selection area not lined up ... (diff)
downloadinkscape-02cb649c0ceebd254dde302eeba71406fb25a24c.tar.gz
inkscape-02cb649c0ceebd254dde302eeba71406fb25a24c.zip
update to trunk (r13829)
(bzr r13798.1.2)
Diffstat (limited to 'src/knot.cpp')
-rw-r--r--src/knot.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/knot.cpp b/src/knot.cpp
index 4118873c1..b3813ab53 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -19,7 +19,7 @@
#include <glibmm/i18n.h>
#include "display/sodipodi-ctrl.h"
#include "desktop.h"
-#include "desktop-handles.h"
+
#include "knot.h"
#include "knot-ptr.h"
#include "document.h"
@@ -109,7 +109,7 @@ SPKnot::SPKnot(SPDesktop *desktop, gchar const *tip)
this->tip = g_strdup (tip);
}
- this->item = sp_canvas_item_new(sp_desktop_controls (desktop),
+ this->item = sp_canvas_item_new(desktop->getControls(),
SP_TYPE_CTRL,
"anchor", SP_ANCHOR_CENTER,
"size", 8.0,
@@ -342,7 +342,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
knot->ungrabbed_signal.emit(knot, event->button.state);
- DocumentUndo::undo(sp_desktop_document(knot->desktop));
+ DocumentUndo::undo(knot->desktop->getDocument());
knot->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Node or handle drag canceled."));
transform_escaped = true;
consumed = TRUE;