CCAR: make it work with vtk > 5.2

diff --git a/src/SVTK/vtkPVAxesActor.cxx b/src/SVTK/vtkPVAxesActor.cxx
index 3fdc0a603550e463a33f405826b5e60fbf7253ae..25f471f249498cd86777ad6f0ee5a957ccb4617e 100644 (file)
--- a/src/SVTK/vtkPVAxesActor.cxx
+++ b/src/SVTK/vtkPVAxesActor.cxx
@@ -257,8 +257,8 @@ int vtkPVAxesActor::RenderOpaqueGeometry(vtkViewport *vp)
 }
 
 //-----------------------------------------------------------------------------
+#if (VTK_MINOR_VERSION>=2)
 // porting to VTK 5.0.x
-/*
 int vtkPVAxesActor::RenderTranslucentPolygonalGeometry(vtkViewport *vp)
 {
   int renderedSomething=0; 
@@ -279,11 +279,9 @@ int vtkPVAxesActor::RenderTranslucentPolygonalGeometry(vtkViewport *vp)
   
   return renderedSomething;
 }
-*/
 
 //-----------------------------------------------------------------------------
 // porting to VTK 5.0.x
-/*
 int vtkPVAxesActor::HasTranslucentPolygonalGeometry()
 {
   int result = 0; 
@@ -304,8 +302,8 @@ int vtkPVAxesActor::HasTranslucentPolygonalGeometry()
   
   return result;
 }
-*/
 
+#else
 //-----------------------------------------------------------------------------
 // porting to VTK 5.0.x
 int vtkPVAxesActor::RenderTranslucentGeometry(vtkViewport *vp)
@@ -328,6 +326,7 @@ int vtkPVAxesActor::RenderTranslucentGeometry(vtkViewport *vp)
   
   return renderedSomething;
 }
+#endif
 
 //-----------------------------------------------------------------------------
 void vtkPVAxesActor::ReleaseGraphicsResources(vtkWindow *win)

diff --git a/src/SVTK/vtkPVAxesActor.h b/src/SVTK/vtkPVAxesActor.h
index 0c21d18865a4b9cb9012ce771c388b854acbec00..8b9d329ccc8766142d0e3d9d6c6480bfc9e110e1 100644 (file)
--- a/src/SVTK/vtkPVAxesActor.h
+++ b/src/SVTK/vtkPVAxesActor.h
@@ -73,9 +73,12 @@ public:
   // Description:
   // Support the standard render methods.
   virtual int RenderOpaqueGeometry(vtkViewport *viewport);
-  //virtual int RenderTranslucentPolygonalGeometry(vtkViewport *viewport); // porting to VTK 5.0.x
-  //virtual int HasTranslucentPolygonalGeometry();                         // porting to VTK 5.0.x
+#if (VTK_MINOR_VERSION>=2)
+  virtual int RenderTranslucentPolygonalGeometry(vtkViewport *viewport); // porting to VTK 5.0.x
+  virtual int HasTranslucentPolygonalGeometry();                         // porting to VTK 5.0.x
+#else
   virtual int RenderTranslucentGeometry(vtkViewport *viewport);            // porting to VTK 5.0.x
+#endif
 
   // Description:
   // Shallow copy of an axes actor. Overloads the virtual vtkProp method.