Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyrights
[modules/gui.git]
/
src
/
VTKViewer
/
VTKViewer_RenderWindow.cxx
diff --git
a/src/VTKViewer/VTKViewer_RenderWindow.cxx
b/src/VTKViewer/VTKViewer_RenderWindow.cxx
old mode 100755
(executable)
new mode 100644
(file)
index
611346f
..
29fdf17
--- a/
src/VTKViewer/VTKViewer_RenderWindow.cxx
+++ b/
src/VTKViewer/VTKViewer_RenderWindow.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-31,7
+31,7
@@
#include <vtkRenderWindowInteractor.h>
#include <vtkRendererCollection.h>
#include <vtkCamera.h>
#include <vtkRenderWindowInteractor.h>
#include <vtkRendererCollection.h>
#include <vtkCamera.h>
-#if
ndef WIN32
+#if
!defined WIN32 && !defined __APPLE__
#include <QX11Info>
#include <vtkXOpenGLRenderWindow.h>
#endif
#include <QX11Info>
#include <vtkXOpenGLRenderWindow.h>
#endif
@@
-47,7
+47,7
@@
QWidget(parent, Qt::FramelessWindowHint )
setAttribute( Qt::WA_DeleteOnClose );
myRW = vtkRenderWindow::New();
setAttribute( Qt::WA_DeleteOnClose );
myRW = vtkRenderWindow::New();
-#if
ndef WIN32
+#if
!defined WIN32 && !defined __APPLE__
myRW->SetDisplayId((void*)(QX11Info::display()));
#endif
myRW->SetWindowId((void*)winId());
myRW->SetDisplayId((void*)(QX11Info::display()));
#endif
myRW->SetWindowId((void*)winId());