0028452: VIS - MSVC 14 compiler warnings

Includes of VTK headers are wrapped in #pragmas to ensure that MSVC warning messages disabled by VTK headers are still enabled for OCCT code

src/IVtkDraw/IVtkDraw.cxx

@@ -85,6 +85,11 @@
 #include <IVtkDraw_HighlightAndSelectionPipeline.hxx>
 #include <IVtkDraw_Interactor.hxx>
 
+// prevent disabling some MSVC warning messages by VTK headers 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4244)
+#endif
 #include <vtkAlgorithmOutput.h>
 #include <vtkAppendPolyData.h>
 #include <vtkBMPWriter.h>
@@ -107,7 +112,6 @@
 #include <vtkSmartPointer.h>
 #include <vtkTIFFWriter.h>
 #include <vtkWindowToImageFilter.h>
-
 #ifndef _WIN32
 #include <X11/X.h>
 #include <X11/Shell.h>
@@ -119,6 +123,9 @@
 #include <X11/Xutil.h>
 #include <tk.h>
 #endif
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 // workaround name conflicts with OCCT methods (in class TopoDS_Shape for example)
 #ifdef Convex

src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.cxx

@@ -15,6 +15,10 @@
 
 #include <IVtkDraw_HighlightAndSelectionPipeline.hxx>
 
+// prevent disabling some MSVC warning messages by VTK headers 
+#ifdef _MSC_VER
+#pragma warning(push)
+#endif
 #include <vtkRenderer.h>
 #include <vtkActor.h>
 #include <vtkPolyDataMapper.h>
@@ -22,6 +26,9 @@
 #include <vtkAppendPolyData.h>
 #include <vtkProperty.h>
 #include <vtkRenderWindow.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 #include <IVtkOCC_Shape.hxx>
 #include <IVtkTools_DisplayModeFilter.hxx>

src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx

@@ -21,11 +21,18 @@
 #include <Standard_Transient.hxx>
 #include <TopoDS_Shape.hxx>
 
+// prevent disabling some MSVC warning messages by VTK headers 
+#ifdef _MSC_VER
+#pragma warning(push)
+#endif
 #include <vtkActor.h>
 #include <vtkPolyData.h>
 #include <vtkPolyDataMapper.h>
 #include <vtkRenderer.h>
 #include <vtkSmartPointer.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 #include <IVtk_Types.hxx>
 #include <IVtkTools_DisplayModeFilter.hxx>

src/IVtkDraw/IVtkDraw_Interactor.cxx

@@ -13,10 +13,28 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
+// prevent disabling some MSVC warning messages by VTK headers 
+#ifdef _MSC_VER
+#pragma warning(push)
+#endif
 #ifdef _WIN32
-#include <windows.h>
 #include <vtkWin32RenderWindowInteractor.h>
 #include <vtkWin32OpenGLRenderWindow.h>
+#else
+#include <GL/glx.h>
+#include <vtkXRenderWindowInteractor.h>
+#include <vtkXOpenGLRenderWindow.h>
+#endif
+#include <vtkActor.h>
+#include <vtkActorCollection.h>
+#include <vtkCommand.h>
+#include <vtkObjectFactory.h>
+#include <vtkSmartPointer.h>
+
+#include <IVtkDraw_Interactor.hxx>
+
+#ifdef _MSC_VER
+#pragma warning(pop)
 #endif
 
 #include <IVtkTools_ShapePicker.hxx>
@@ -24,28 +42,10 @@
 #include <IVtkTools_DisplayModeFilter.hxx>
 #include <IVtkTools_ShapeObject.hxx>
 #include <IVtkTools_ShapeDataSource.hxx>
-#include <IVtkDraw_Interactor.hxx>
 
 #include <Message.hxx>
 #include <Message_Messenger.hxx>
 
-#include <vtkActor.h>
-#include <vtkActorCollection.h>
-#include <vtkCommand.h>
-#include <vtkObjectFactory.h>
-#include <vtkSmartPointer.h>
-
-#ifndef _WIN32
-#include <X11/X.h>
-#include <X11/Shell.h>
-#include <X11/Xlib.h>
-#include <GL/glx.h>
-#include <vtkXRenderWindowInteractor.h>
-#include <vtkXOpenGLRenderWindow.h>
-#include <X11/Xutil.h>
-#include <tk.h>
-#endif
-
 //===========================================================
 // Function : ClearHighlightAndSelection
 // Purpose  :

src/IVtkDraw/IVtkDraw_Interactor.hxx

@@ -30,8 +30,16 @@
 #include <tk.h>
 #endif
 
+// prevent disabling some MSVC warning messages by VTK headers 
+#ifdef _MSC_VER
+#pragma warning(push)
+#endif
 #include <vtkRenderWindowInteractor.h>
 #include <vtkSmartPointer.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #include <IVtkTools_ShapePicker.hxx>
 #include <IVtkDraw_HighlightAndSelectionPipeline.hxx>
 #include <Aspect_Window.hxx>