summaryrefslogtreecommitdiffstats
path: root/src/rect-context.cpp
diff options
context:
space:
mode:
authorAndrew Higginson <at.higginson@gmail.com>2011-12-27 21:04:47 +0000
committerAndrew <at.higginson@gmail.com>2011-12-27 21:04:47 +0000
commit80960b623a99aae1402ab651b2974ef544ed3b03 (patch)
treeba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/rect-context.cpp
parenttry to fix bug (diff)
parentGDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff)
downloadinkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz
inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/rect-context.cpp')
-rw-r--r--src/rect-context.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rect-context.cpp b/src/rect-context.cpp
index bcb1bf734..8f0ec8763 100644
--- a/src/rect-context.cpp
+++ b/src/rect-context.cpp
@@ -65,7 +65,7 @@ static void sp_rect_cancel(SPRectContext *rc);
static SPEventContextClass *parent_class;
-GtkType sp_rect_context_get_type()
+GType sp_rect_context_get_type()
{
static GType type = 0;
if (!type) {
@@ -163,9 +163,9 @@ static void sp_rect_context_dispose(GObject *object)
}
/**
-\brief Callback that processes the "changed" signal on the selection;
-destroys old and creates new knotholder
-*/
+ * Callback that processes the "changed" signal on the selection;
+ * destroys old and creates new knotholder.
+ */
void sp_rect_context_selection_changed(Inkscape::Selection *selection, gpointer data)
{
SPRectContext *rc = SP_RECT_CONTEXT(data);
@@ -281,14 +281,14 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
/* Position center */
Geom::Point button_dt(desktop->w2d(button_w));
- rc->center = from_2geom(button_dt);
+ rc->center = button_dt;
/* Snap center */
SnapManager &m = desktop->namedview->snap_manager;
m.setup(desktop);
m.freeSnapReturnByRef(button_dt, Inkscape::SNAPSOURCE_NODE_HANDLE);
m.unSetup();
- rc->center = from_2geom(button_dt);
+ rc->center = button_dt;
sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
( GDK_KEY_PRESS_MASK |