#3107 BBTK Bug New Normal - branch vtk7itk4 compilation with vtk7

[bbtk.git] / packages / wxvtk / src / wxvtkImageViewer2.h

diff --git a/packages/wxvtk/src/wxvtkImageViewer2.h b/packages/wxvtk/src/wxvtkImageViewer2.h
index ff097bd36d186db26cc91562fef737dc5935bbea..47867584fb5103009e0fe3cf340f5cbf6db663d7 100644 (file)
--- a/packages/wxvtk/src/wxvtkImageViewer2.h
+++ b/packages/wxvtk/src/wxvtkImageViewer2.h
@@ -96,7 +96,14 @@ class /*VTK_RENDERING_EXPORT*/ wxvtkImageViewer2 : public vtkObject
 {
 public:
   static wxvtkImageViewer2 *New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
   vtkTypeRevisionMacro(wxvtkImageViewer2,vtkObject);
+#else
+  vtkTypeMacro(wxvtkImageViewer2,vtkObject);
+#endif
+
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
@@ -157,7 +164,9 @@ public:
   virtual int GetSliceMin();
   virtual int GetSliceMax();
   virtual void GetSliceRange(int range[2])
-    { this->GetSliceRange(range[0], range[1]); }
+       { 
+               this->GetSliceRange(range[0], range[1]); 
+       }
   virtual void GetSliceRange(int &min, int &max);
   virtual int* GetSliceRange();
   
@@ -178,7 +187,10 @@ public:
   // Set/Get the position in screen coordinates of the rendering window.
   virtual int* GetPosition();
   virtual void SetPosition(int a,int b);
-  virtual void SetPosition(int a[2]) { this->SetPosition(a[0],a[1]); }
+  virtual void SetPosition(int a[2]) 
+       { 
+               this->SetPosition(a[0],a[1]); 
+       }
   
   // Description:
   // Set/Get the size of the window in screen coordinates in pixels.