OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-13 14:27:08 +03:00
Code Activity

0028452: VIS - MSVC 14 compiler warnings

Browse Source 
Includes of VTK headers are wrapped in #pragmas to ensure that MSVC warning messages disabled by VTK headers are still enabled for OCCT code
This commit is contained in:
abv
2017-08-15 16:04:45 +03:00
committed by bugmaster
parent c8fe0e2db4
commit a966092904
16 changed files with 136 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/IVtkDraw/IVtkDraw_Interactor.cxx
View File

@@ -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 :