#3230 vtk8itk4wx3-mingw64 MACOS

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
index eb454c97a37b72c888c3602cf80790fc1277e944..81a146e69d73b00930652ca291cc8f9060b001f2 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
@@ -45,7 +45,7 @@ wxVtkBaseView::wxVtkBaseView()
 wxVtkBaseView::wxVtkBaseView(wxWindow *parent)
 {
        _parent                         = parent;
-       _iren                           = (wxVTKRenderWindowInteractor*)new wxVTKRenderWindowInteractorPlus(_parent,this);
+       _iren                           = (crea::wxVTKRenderWindowInteractor*)new wxVTKRenderWindowInteractorPlus(_parent,this);
 //     _iren->UseCaptureMouseOn();
 //     _iren                           = new wxVTKRenderWindowInteractor(_parent,-1);
        _interactorStyle        = NULL;
@@ -58,11 +58,12 @@ wxVtkBaseView::~wxVtkBaseView()
        //_iren=NULL;
 }
 //-------------------------------------------------------------------
-wxVTKRenderWindowInteractor* wxVtkBaseView::GetWxVTKRenderWindowInteractor() throw (char*)
+crea::wxVTKRenderWindowInteractor* wxVtkBaseView::GetWxVTKRenderWindowInteractor() throw (char*)
 {
 
-       if(_iren==NULL){
-               throw "wxVtkBaseView::GetWxVTKRenderWindowInteractor() _iren wxVTKRenderWindowInteractorPlus =NULL";
+       if(_iren==NULL)
+       {
+               throw "wxVtkBaseView::GetWxVTKRenderWindowInteractor() _iren cwxVTKRenderWindowInteractorPlus =NULL";
        }
    return _iren;
 }
@@ -116,7 +117,7 @@ void wxVtkBaseView::TransCoordScreenToWorld(double &X, double &Y, double &Z, int
        GetRenderer()->DisplayToWorld();
        double fP[4];
        GetRenderer()->GetWorldPoint( fP );
-       if ( fP[3] ){
+    if ( fP[3] ){
                fP[0] /= fP[3];
                fP[1] /= fP[3];
                fP[2] /= fP[3];
@@ -148,7 +149,7 @@ void wxVtkBaseView::TransFromCoordScreenToWorld(double &X, double &Y, double &Z,
 
        X = xx;
        Y = yy;
-       Z=zz;
+       Z = zz;
 
 // EEDx5
        //JCP 13/05/2009
@@ -174,7 +175,8 @@ void wxVtkBaseView::TransFromCoordScreenToWorld(double &X, double &Y, double &Z,
        if (type!=2)
        {
                Z=fP[2];
-       } 
+       }
+
 }
 
 //---------------------------------------------------------------------------