#3474 Refresh optimization DrawAxisTree3D Box

[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 a6991c40908ac330e9246135a1b43f39b03331a7..b40c577960ab68b8c30cf1ab72ac7e50f0ec2ccd 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)
 {
@@ -139,7 +135,7 @@ void  vtkInteractorStyleBaseView::RemoveInteractorStyleMaracas(InteractorStyleMa
                        removed = true;
                } else {
                  iter++;
-               }
+               }               
        }               
 }
 //---------------------------------------------------------------------------
@@ -151,21 +147,10 @@ void vtkInteractorStyleBaseView::InsertInteractorStyleMaracas(int pos, Interacto
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type)
 {
-
        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++)
        {
@@ -292,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];
@@ -366,7 +352,6 @@ bool vtkInteractorStyleBaseView::GetParent_refresh_waiting()
 //---------------------------------------------------------------------------
 void vtkInteractorStyleBaseView::EvaluateToRefresh()
 {
-
        if  ( _blockRefresh==false )
        {
                if ( (_refresh_waiting==true) && (_parent_refresh_waiting==false))
@@ -379,7 +364,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++)