#135 BBTK Feature New Normal - branch vtk7itk4wx3

diff --cc packages/wxvtk/src/bbwxvtkViewer2D.cxx
index 23cd7d2dbec6325ecb4ac5c00f41952025a20bc0,aef4777b23692a7c83796792be56182df59c286c..26c2d367fa2ee10b7f67bd0d742a645799aa311c
--- 1/packages/wxvtk/src/bbwxvtkViewer2D.cxx
--- 2/packages/wxvtk/src/bbwxvtkViewer2D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
@@@ -74,22 -62,15 +74,22 @@@ namespace bbwxvt
      Viewer2DWidget(Viewer2D* box, wxWindow *parent);
      ~Viewer2DWidget();
      void UpdateView();
 -    vtkRenderer               *GetRenderer();
 -    vtkImageActor       *GetImageActor();
 +    vtkRenderer                                       *GetRenderer();
 +    vtkImageActor                             *GetImageActor();
    private:
 -    bool                        mFirstTime;
 -    Viewer2D                    *mBox;
 -    wxvtkImageViewer2         *imageViewer;
 -    vtkImageData              *backImageData;
 -    vtkImageData              *mDefaultImage;
 +    bool                                      mFirstTime;
 +    Viewer2D                                  *mBox;
 +
 +//EED 2017-01-01 Migration VTK7
 +#if VTK_MAJOR_VERSION <= 5
 +    wxvtkImageViewer2                 *imageViewer;
 +#else
 +    vtkImageViewer2                           *imageViewer;
 +#endif
 +
 +    vtkImageData                              *backImageData;
 +    vtkImageData                              *mDefaultImage;
-     wxVTKRenderWindowInteractor *wxvtkrenderwindowinteractor;
+     crea::wxVTKRenderWindowInteractor *wxvtkrenderwindowinteractor;
      bool mUpdateCamera;
  
      vtkImplicitPlaneWidget * maPlane1, * maPlane2, * mbPlane1, * mbPlane2;
@@@ -101,18 -83,11 +101,17 @@@
      mFirstTime(true),
      mBox(box)
    {
-     wxPanel *panel    = this;
- 
-     wxvtkrenderwindowinteractor = new wxVTKRenderWindowInteractor(panel,-1);
+     wxPanel *panel            = this;
+     wxvtkrenderwindowinteractor = new crea::wxVTKRenderWindowInteractor(panel,-1);
      wxvtkrenderwindowinteractor->UseCaptureMouseOn(); 
  
 +//EED 2017-01-01 Migration VTK7
 +#if VTK_MAJOR_VERSION <= 5
      imageViewer       = wxvtkImageViewer2::New();
 +#else
 +    imageViewer       = vtkImageViewer2::New();
 +#endif
 +
      imageViewer->SetSlice( 1 );
      imageViewer->SetupInteractor ( wxvtkrenderwindowinteractor );
      

diff --cc packages/wxvtk/src/bbwxvtkViewer2D.h
index 8400ae0fd23ba58368c5b810da4f5f5f8683bcd6,f755890a9137c7eabbdc57379ad968586e473e0b..2acb2834fdf428aa472ce139c5c7d49a61a38dda
--- 1/packages/wxvtk/src/bbwxvtkViewer2D.h
--- 2/packages/wxvtk/src/bbwxvtkViewer2D.h
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.h
@@@ -59,7 -59,9 +59,9 @@@
  #include "vtkImplicitPlaneWidget.h"
  
  #include "bbtkWxBlackBox.h"
 +
+ #include "creawxVTKRenderWindowInteractor.h"
+ 
  namespace bbwxvtk
  {
    //------------------------------------------------------------------------