If map tool implements own deactivate() method, it _should_ call also…

… QgsMapTool::deactivate() otherwise some things like deactivation of associated action/button won't work properly. git-svn-id: http://svn.osgeo.org/qgis/trunk@9664 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 18, 2008 · 11578cb · 11578cb
1 parent 4c5e483
commit 11578cb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/src/app/qgsmaptooladdvertex.cpp b/src/app/qgsmaptooladdvertex.cpp
@@ -121,4 +121,6 @@ void QgsMapToolAddVertex::deactivate()
 {
   delete mRubberBand;
   mRubberBand = 0;
+
+  QgsMapTool::deactivate();
 }
diff --git a/src/app/qgsmaptoolcapture.cpp b/src/app/qgsmaptoolcapture.cpp
@@ -83,6 +83,8 @@ void QgsMapToolCapture::deactivate()
   delete mRubberBand;
   mRubberBand = 0;
   mCaptureList.clear();
+
+  QgsMapTool::deactivate();
 }
 
 int QgsMapToolCapture::addVertex( const QPoint& p )

diff --git a/src/app/qgsmaptooldeletevertex.cpp b/src/app/qgsmaptooldeletevertex.cpp
@@ -93,4 +93,6 @@ void QgsMapToolDeleteVertex::deactivate()
 {
   delete mCross;
   mCross = 0;
+
+  QgsMapTool::deactivate();
 }
diff --git a/src/app/qgsmaptoolmovefeature.cpp b/src/app/qgsmaptoolmovefeature.cpp
@@ -150,4 +150,6 @@ void QgsMapToolMoveFeature::deactivate()
   //delete rubber band
   delete mRubberBand;
   mRubberBand = 0;
+
+  QgsMapTool::deactivate();
 }
diff --git a/src/app/qgsmaptoolmovevertex.cpp b/src/app/qgsmaptoolmovevertex.cpp
@@ -188,6 +188,8 @@ void QgsMapToolMoveVertex::canvasReleaseEvent( QMouseEvent * e )
 void QgsMapToolMoveVertex::deactivate()
 {
   removeRubberBands();
+
+  QgsMapTool::deactivate();
 }
 
 void QgsMapToolMoveVertex::removeRubberBands()