From: ana <ana@opencascade.com>
Date: Thu, 24 Nov 2016 11:26:51 +0000 (+0300)
Subject: Windows compatibility.
X-Git-Tag: V8_2_0rc1~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8d3405d6aa5e63bb6680dca7d21c2df6c555e783;p=modules%2Fgui.git

Windows compatibility.
---

diff --git a/src/PVViewer/CMakeLists.txt b/src/PVViewer/CMakeLists.txt
index c52d03bf1..623550d73 100644
--- 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 9af71e3a7..efa906100 100644
--- 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 a6c2ddf9f..95c13743f 100644
--- 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 da12e3525..6f11e2bb0 100644
--- 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 04a5a9f0b..9cfd4a8d0 100644
--- 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 7d676c4cf..76f5d153b 100755
--- 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 1b2a2a497..e09c1e3e5 100755
--- 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();
 
   //----------------------------------------------------------------------------