X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkInteractorStyleBaseView.cxx;h=d7c6b6843aca7ba420ab5742f9bce08f551f3ffb;hb=c5bb8b228d6fcd2a4ea1d6210bfa3a39d6bcac33;hp=89aee7044a585291e338a9306db000adccbc0f12;hpb=eb653a89f177ee41fda8720ec32bfbf3aa57255e;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
index 89aee70..d7c6b68 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "vtkInteractorStyleBaseView.h"
 
 #include "wxVtk3DBaseView.h"
@@ -78,29 +103,17 @@ void vtkInteractorStyleBaseView::OnRightDClick()  // virtual
 {
 	CallLstInteractorStyleMaracas( 12 );
 }
-//---------------------------------------------------------------------------
-//EED27Juillet2011
-void vtkInteractorStyleBaseView::OnMouseWheel()  // virtual
-{
-	printf("EED vtkInteractorStyleBaseView::OnMouseWheel\n");
-	CallLstInteractorStyleMaracas( 14 );
-}
+
 
 void  vtkInteractorStyleBaseView::OnMouseWheelForward()  // virtual
 {
-	printf("EED.. vtkInteractorStyleBaseView::OnMouseWheelForward\n");
 	CallLstInteractorStyleMaracas( 15 );
 }
 
 void vtkInteractorStyleBaseView::OnMouseWheelBackward() // virtual
 {
-	printf("EED.. vtkInteractorStyleBaseView::OnMouseWheelBackward\n");
 	CallLstInteractorStyleMaracas( 16 );
 }
-
-
-
-
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::AddInteractorStyleMaracas(InteractorStyleMaracas* interactorStyleMaracas)
 {
@@ -122,7 +135,7 @@ void  vtkInteractorStyleBaseView::RemoveInteractorStyleMaracas(InteractorStyleMa
 			removed = true;
 		} else {
 		  iter++;
-		}
+		}		
 	}		
 }
 //---------------------------------------------------------------------------
@@ -134,7 +147,6 @@ void vtkInteractorStyleBaseView::InsertInteractorStyleMaracas(int pos, Interacto
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type)
 {
-
 	InteractorStyleMaracas *intStyMar;
 
 	int i,size=_lstInteractorStyleMaracas.size();
@@ -236,15 +248,7 @@ void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type)
 					i=size;
 				}
 			}
-			
-			//EED ?????  27Juillet2011	
-			if (type==14)
-			{  // OnMouseWheel
-				if (intStyMar->OnMouseWheel()==false)
-				{
-					i=size;
-				}
-			}
+			// 14 ... old OnMouseWheelFordward
 			if (type==15)
 			{  // OnMouseWheelForward
 				if (intStyMar->OnMouseWheelForward()==false)
@@ -357,7 +361,6 @@ bool vtkInteractorStyleBaseView::GetParent_refresh_waiting()
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::EvaluateToRefresh()
 {
-
 	if  ( _blockRefresh==false )
 	{
 		if ( (_refresh_waiting==true) && (_parent_refresh_waiting==false))
@@ -370,7 +373,13 @@ void vtkInteractorStyleBaseView::EvaluateToRefresh()
 			_parent_refresh_waiting	= false;
 			wxCommandEvent newevent1(wxEVT_COMMAND_MENU_SELECTED,12121);  // Refresh
 //CPR 13/01/2010
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
 			this->_wxvtkbaseview->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessEvent(newevent1);
+#else
+			this->_wxvtkbaseview->GetWxVTKRenderWindowInteractor()->GetParent()->ProcessWindowEvent(newevent1);
+#endif
+
 			int i;
 			int size = _lstParentToReport.size();
 			for(i = 0; i<size; i++)