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
/
SVTK
/
SVTK_RenderWindowInteractor.h
diff --git
a/src/SVTK/SVTK_RenderWindowInteractor.h
b/src/SVTK/SVTK_RenderWindowInteractor.h
index b66ca9d4ac50859f6377c270d15a15f1e17cf653..e04a2edbfd9d48bd08df692566afbf527d79a27e 100644
(file)
--- a/
src/SVTK/SVTK_RenderWindowInteractor.h
+++ b/
src/SVTK/SVTK_RenderWindowInteractor.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-122,12
+122,16
@@
class SVTK_EXPORT QVTK_RenderWindowInteractor: public QWidget
virtual void focusOutEvent( QFocusEvent* );
//! To handle native events (from such devices as SpaceMouse)
virtual void focusOutEvent( QFocusEvent* );
//! To handle native events (from such devices as SpaceMouse)
-#ifdef WIN32
+// TODO (QT5 PORTING) Below is a temporary solution, to allow compiling with Qt 5
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#if defined(WIN32)
virtual bool winEvent( MSG*, long* );
virtual bool winEvent( MSG*, long* );
-#el
se
+#el
if !defined(__APPLE__)
virtual bool x11Event( XEvent *e );
#endif
virtual bool x11Event( XEvent *e );
#endif
-
+#else
+ virtual bool nativeEvent( const QByteArray&, void*, long* );
+#endif
vtkSmartPointer<vtkRenderWindow> myRenderWindow;
vtkSmartPointer<vtkGenericRenderWindowInteractor> myDevice;
};
vtkSmartPointer<vtkRenderWindow> myRenderWindow;
vtkSmartPointer<vtkGenericRenderWindowInteractor> myDevice;
};