Windows compatibility.

diff --git a/src/PVViewer/CMakeLists.txt b/src/PVViewer/CMakeLists.txt
index c52d03bf1f5e9c355fa1d875aa4db20515e7f283..623550d735a9179f8485dc4f3aa548cf81349d26 100644 (file)
--- a/src/PVViewer/CMakeLists.txt
+++ b/src/PVViewer/CMakeLists.txt
@@ -49,6 +49,7 @@ SET(_link_LIBRARIES
   pqApplicationComponents
   #vtkRenderingFreeTypeOpenGL
   vtkRenderingFreeType
+  vtkInteractionStyle
   )
 
 # --- headers ---

diff --git a/src/SVTK/SVTK_DeviceActor.cxx b/src/SVTK/SVTK_DeviceActor.cxx
index 9af71e3a7bf8ca15b1b439d40bbf9cf2fe1ce7f6..efa906100d974096ffee624b68e5ffc665228c4d 100644 (file)
--- a/src/SVTK/SVTK_DeviceActor.cxx
+++ b/src/SVTK/SVTK_DeviceActor.cxx
@@ -189,11 +189,11 @@ SetStoreMapping(bool theStoreMapping)
 /*!
   \return time of modification
 */
-unsigned long int 
+vtkMTimeType
 SVTK_DeviceActor
 ::GetMTime()
 {
-  unsigned long mTime = this->Superclass::GetMTime();
+  vtkMTimeType mTime = this->Superclass::GetMTime();
 
   mTime = std::max(mTime,myGeomFilter->GetMTime());
 

diff --git a/src/SVTK/SVTK_DeviceActor.h b/src/SVTK/SVTK_DeviceActor.h
index a6c2ddf9f69f3eeb33e2e30deb3a85d469e8f81c..95c13743f0472200d1e077059616564b5e34b4de 100644 (file)
--- a/src/SVTK/SVTK_DeviceActor.h
+++ b/src/SVTK/SVTK_DeviceActor.h
@@ -112,7 +112,7 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   //@}
 
   virtual 
-  unsigned long int 
+  vtkMTimeType
   GetMTime();
 
   /** @name For shrink mamnagement purpose */

diff --git a/src/SVTK/salomevtkPVAxesActor.cxx b/src/SVTK/salomevtkPVAxesActor.cxx
index da12e35253276871de5364115170c031843861ba..6f11e2bb068b1f3d5ae506ca5141b17c21182b9f 100644 (file)
--- a/src/SVTK/salomevtkPVAxesActor.cxx
+++ b/src/SVTK/salomevtkPVAxesActor.cxx
@@ -429,18 +429,17 @@ double *vtkPVAxesActor::GetBounds()
 }
 
 //-----------------------------------------------------------------------------
-unsigned long int vtkPVAxesActor::GetMTime()
+vtkMTimeType vtkPVAxesActor::GetMTime()
 {
-  unsigned long mTime=this->Superclass::GetMTime();
-
+  vtkMTimeType mTime=this->Superclass::GetMTime();
 
   return mTime;
 }
 
 //-----------------------------------------------------------------------------
-unsigned long int vtkPVAxesActor::GetRedrawMTime()
+vtkMTimeType vtkPVAxesActor::GetRedrawMTime()
 {
-  unsigned long mTime=this->GetMTime();
+  vtkMTimeType mTime =this->GetMTime();
 
   return mTime;
 }

diff --git a/src/SVTK/salomevtkPVAxesActor.h b/src/SVTK/salomevtkPVAxesActor.h
index 04a5a9f0b54acd1a03c41671fcf8f99f3c598969..9cfd4a8d05b49b8bb14e062b585867ddba4b18fd 100644 (file)
--- a/src/SVTK/salomevtkPVAxesActor.h
+++ b/src/SVTK/salomevtkPVAxesActor.h
@@ -107,14 +107,14 @@ public:
 
   // Description:
   // Get the actors mtime plus consider its properties and texture if set.
-  unsigned long int GetMTime();
+  vtkMTimeType GetMTime();
   
   // Description:
   // Return the mtime of anything that would cause the rendered image to 
   // appear differently. Usually this involves checking the mtime of the 
   // prop plus anything else it depends on such as properties, textures
   // etc.
-  virtual unsigned long GetRedrawMTime();
+  vtkMTimeType GetRedrawMTime();
 
   // Description:
   // Set the total length of the axes in 3 dimensions.

diff --git a/src/VTKViewer/VTKViewer_Actor.cxx b/src/VTKViewer/VTKViewer_Actor.cxx
index 7d676c4cff0162c6345894ee43aeb4bfbde9356c..76f5d153bde1b9a64534a216f774c4ab2b6b0c82 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Actor.cxx
+++ b/src/VTKViewer/VTKViewer_Actor.cxx
@@ -332,12 +332,12 @@ VTKViewer_Actor
 /*!
   To calculatate last modified time
 */
-unsigned long int
+vtkMTimeType
 VTKViewer_Actor
 ::GetMTime()
 {
-  unsigned long mTime = this->Superclass::GetMTime();
-  unsigned long time = myTransformFilter->GetMTime();
+  vtkMTimeType mTime = this->Superclass::GetMTime();
+  vtkMTimeType time = myTransformFilter->GetMTime();
   mTime = ( time > mTime ? time : mTime );
   if(vtkDataSet *aDataSet = dynamic_cast<vtkDataSet*>(myPassFilter[0]->GetInput())){ // bad usage of GetInput
     time = aDataSet->GetMTime();

diff --git a/src/VTKViewer/VTKViewer_Actor.h b/src/VTKViewer/VTKViewer_Actor.h
index 1b2a2a497292d9819931647b492cdc74b82925f0..e09c1e3e5184d211c428b4e3036aef5aeac3ce2e 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Actor.h
+++ b/src/VTKViewer/VTKViewer_Actor.h
@@ -179,7 +179,7 @@ class VTKVIEWER_EXPORT VTKViewer_Actor : public vtkLODActor
 
   //! To calculatate last modified time
   virtual
-  unsigned long int
+  vtkMTimeType
   GetMTime();
 
   //----------------------------------------------------------------------------