From 6ee13490aaa9781b765589e22fb9206c6cb7e9e9 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 28 Sep 2013 20:47:16 +0200 Subject: Fixed MeasureContext. Fixed bugs: - https://launchpad.net/bugs/1232494 (bzr r12613) --- src/measure-context.cpp | 4 ---- src/measure-context.h | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/measure-context.cpp b/src/measure-context.cpp index 9d8dc2b2f..7570e36e7 100644 --- a/src/measure-context.cpp +++ b/src/measure-context.cpp @@ -309,10 +309,6 @@ static void calculate_intersections(SPDesktop * /*desktop*/, SPItem* item, Geom: } bool SPMeasureContext::root_handler(GdkEvent* event) { - Geom::Point start_point; - boost::optional explicitBase; - boost::optional lastEnd; - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); diff --git a/src/measure-context.h b/src/measure-context.h index e42265045..7d5a88ab7 100644 --- a/src/measure-context.h +++ b/src/measure-context.h @@ -13,6 +13,8 @@ */ #include "event-context.h" +#include <2geom/point.h> +#include #define SP_MEASURE_CONTEXT(obj) (dynamic_cast((SPEventContext*)obj)) #define SP_IS_MEASURE_CONTEXT(obj) (dynamic_cast((const SPEventContext*)obj) != NULL) @@ -31,6 +33,10 @@ public: private: SPCanvasItem* grabbed; + + Geom::Point start_point; + boost::optional explicitBase; + boost::optional lastEnd; }; #endif // SEEN_SP_MEASURING_CONTEXT_H -- cgit v1.2.3