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
Upgrade to paraview 5.4
[modules/gui.git]
/
src
/
VTKViewer
/
VTKViewer_RenderWindow.cxx
diff --git
a/src/VTKViewer/VTKViewer_RenderWindow.cxx
b/src/VTKViewer/VTKViewer_RenderWindow.cxx
index a42f1653516ad3fdaa7d58129f8cd25bb72997d2..16aafdbc3dcfec3803e1b4a361761d37bbc2a371 100755
(executable)
--- a/
src/VTKViewer/VTKViewer_RenderWindow.cxx
+++ b/
src/VTKViewer/VTKViewer_RenderWindow.cxx
@@
-31,12
+31,9
@@
#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>
#include <QX11Info>
#include <vtkXOpenGLRenderWindow.h>
-//#include <GL/gl.h>
-//#include <GL/glu.h>
-//#include <qgl.h>
#endif
/*!Constructor. Create render window with parant \a parent and name \a name.
#endif
/*!Constructor. Create render window with parant \a parent and name \a name.
@@
-50,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());