fixed some issues

improvied editing
changed toolbox

mapview/2D/tools/ToolMeasure.h

@@ -25,7 +25,6 @@ protected:
 
 	/** register this tool into the given tools-queue */
 	Tools& tools;
-	Tool* oldMainTool;
 
 	std::vector<Point2> pts_m;
 
@@ -33,17 +32,12 @@ public:
 
 	/** ctor */
 	ToolMeasure(Tools& tools) : tools(tools) {
-
-		oldMainTool = tools.getMain();		// keep the current tool to reset it later
-		tools.setMain(this);
-
 		resetMe();
-
 	}
 
 	/** dtor */
 	virtual ~ToolMeasure() {
-		tools.setMain(oldMainTool);			// reset to the previous tool
+		tools.setMainDefault();
 	}
 
 	const std::string getName() const {