X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkInteractorStyleBaseView.cxx;h=b40c577960ab68b8c30cf1ab72ac7e50f0ec2ccd;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=c250f045f0d26060d733ad79f1c17d397993d3cb;hpb=2c09a61fc7d7695eebf8ca886fb8cd727afccc09;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
index c250f04..b40c577 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
@@ -114,10 +114,6 @@ void vtkInteractorStyleBaseView::OnMouseWheelBackward() // virtual
 {
 	CallLstInteractorStyleMaracas( 16 );
 }
-
-
-
-
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::AddInteractorStyleMaracas(InteractorStyleMaracas* interactorStyleMaracas)
 {
@@ -151,23 +147,10 @@ void vtkInteractorStyleBaseView::InsertInteractorStyleMaracas(int pos, Interacto
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type)
 {
-
-
-printf("EED vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas Start --------\n");
 	InteractorStyleMaracas *intStyMar;
 
 	int i,size=_lstInteractorStyleMaracas.size();
 
-//EED Borrame
-//FILE *ff = fopen("c:/temp/wxVtkBaseView_SceneManagerStadistics.txt","a+");
-//fprintf(ff,"EED vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas \n" );
-//for (i=0;i<size;i++)
-//{
-//fprintf(ff,"    %p\n" , _lstInteractorStyleMaracas[i] );
-//}
-//fclose(ff);
-
-
 
 	for (i=0;i<size;i++)
 	{
@@ -294,7 +277,8 @@ void vtkInteractorStyleBaseView::TransformCoordinate(double &X, double &Y, doubl
 		double fP[4];
 		imageViewer->GetRenderer()->GetWorldPoint( fP );
 
-		if ( fP[3] ){
+		if ( fP[3] )
+		{
 			fP[0] /= fP[3];
 			fP[1] /= fP[3];
 			fP[2] /= fP[3];
@@ -368,22 +352,25 @@ bool vtkInteractorStyleBaseView::GetParent_refresh_waiting()
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::EvaluateToRefresh()
 {
-printf("EED vtkInteractorStyleBaseView::EvaluateToRefresh start 1\n");
 	if  ( _blockRefresh==false )
 	{
 		if ( (_refresh_waiting==true) && (_parent_refresh_waiting==false))
 		{
-printf("EED vtkInteractorStyleBaseView::EvaluateToRefresh start 2\n");
 			_refresh_waiting		= false;
 			this->_wxvtkbaseview->Refresh();
 		}
 		if (_parent_refresh_waiting==true)
 		{
-printf("EED vtkInteractorStyleBaseView::EvaluateToRefresh start 3\n");
 			_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++)