From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr> Date: Mon, 4 Oct 2010 05:18:13 +0000 (+0000) Subject: no message X-Git-Tag: CREATOOLS.2-0-3~2 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e5dd3702826e57ae15d40b8cda521e8ae17d5c57;p=creaMaracasVisu.git no message --- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx index 6ed188a..3a1918b 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx @@ -131,7 +131,7 @@ void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type) for (i=0;i<size;i++) { - if (i < _lstInteractorStyleMaracas.size() ) + if (i < (int)_lstInteractorStyleMaracas.size() ) { intStyMar = _lstInteractorStyleMaracas[i]; } else { diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx index 0b2e7c2..4b7b592 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx @@ -103,8 +103,9 @@ void vtkInteractorStyleBaseView3D::OnMouseMove () } //--------------------------------------------------------------------------- -void vtkInteractorStyleBaseView3D::OnLeftButtonDown () +void vtkInteractorStyleBaseView3D::OnLeftButtonDown() { + printf("EED creaMaracasVisu::vtkInteractorStyleBaseView3D::OnLeftButtonDown \n"); vtkInteractorStyleBaseView::OnLeftButtonDown(); /* if (GetInteractor()->GetControlKey()==1 ){ diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx index 692419a..e337fb6 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractor.cxx @@ -3,8 +3,8 @@ Program: Visualization Toolkit Module: $RCSfile: wxVTKRenderWindowInteractor.cxx,v $ Language: C++ - Date: $Date: 2010/08/25 17:51:12 $ - Version: $Revision: 1.4 $ + Date: $Date: 2010/10/04 05:18:13 $ + Version: $Revision: 1.5 $ Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen All rights reserved. @@ -541,6 +541,7 @@ void wxVTKRenderWindowInteractor::OnKeyUp(wxKeyEvent &event) //--------------------------------------------------------------------------- void wxVTKRenderWindowInteractor::OnButtonDown(wxMouseEvent &event) { + if (!Enabled || (ActiveButton != wxEVT_NULL)) { return;