#3230 vtk8itk4wx3-mingw64 MACOS

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / vtkInteractorStyleBaseView.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
index 21f323355704a8f0f3dfa44691286b4d6c9ada41..7b8c144d3bbf197f37c84db88bf6556e7b48c392 100644 (file)
--- 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)
 {
@@ -291,7 +287,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];
@@ -377,7 +374,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++)