diff options
| author | Andrew Higginson <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
|---|---|---|
| committer | Andrew <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
| commit | 80960b623a99aae1402ab651b2974ef544ed3b03 (patch) | |
| tree | ba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/arc-context.cpp | |
| parent | try to fix bug (diff) | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip | |
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/arc-context.cpp')
| -rw-r--r-- | src/arc-context.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 76b064f06..1f3e118fe 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -1,5 +1,6 @@ -/** @file - * @brief Ellipse drawing context +/** + * @file + * Ellipse drawing context. */ /* Authors: * Mitsuru Oka @@ -14,8 +15,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#define __SP_ARC_CONTEXT_C__ - #ifdef HAVE_CONFIG_H # include <config.h> #endif @@ -63,7 +62,7 @@ static void sp_arc_cancel(SPArcContext *ec); static SPEventContextClass *parent_class; -GtkType sp_arc_context_get_type() +GType sp_arc_context_get_type() { static GType type = 0; if (!type) { @@ -155,9 +154,9 @@ static void sp_arc_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_arc_context_selection_changed(Inkscape::Selection * selection, gpointer data) { SPArcContext *ac = SP_ARC_CONTEXT(data); @@ -447,7 +446,7 @@ static void sp_arc_drag(SPArcContext *ac, Geom::Point pt, guint state) Geom::Point c = r.midpoint(); if (!ctrl_save) { if (fabs(dir[Geom::X]) > 1E-6 && fabs(dir[Geom::Y]) > 1E-6) { - Geom::Affine const i2d ((ac->item)->i2d_affine ()); + Geom::Affine const i2d ( (ac->item)->i2dt_affine() ); Geom::Point new_dir = pt * i2d - c; new_dir[Geom::X] *= dir[Geom::Y] / dir[Geom::X]; double lambda = new_dir.length() / dir[Geom::Y]; |