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=e263b7ace0f53d647a731553a3f67700838ad146;hp=21f323355704a8f0f3dfa44691286b4d6c9ada41;hpb=27bfc7379430093578783cebcc1743f8626e25e8;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx index 21f3233..d7c6b68 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) { @@ -377,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