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.cxx
diff --git
a/src/SVTK/SVTK_RenderWindowInteractor.cxx
b/src/SVTK/SVTK_RenderWindowInteractor.cxx
index e1175153762f93848dd31d1526f163eb4e08b731..c6278f7c2665cbe197a689dd12bafa7907d2a69f 100644
(file)
--- a/
src/SVTK/SVTK_RenderWindowInteractor.cxx
+++ b/
src/SVTK/SVTK_RenderWindowInteractor.cxx
@@
-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
@@
-34,7
+34,7
@@
// QT Includes
// Put Qt includes before the X11 includes which #define the symbol None
// (see SVTK_SpaceMouse.h) to avoid the compilation error.
// QT Includes
// Put Qt includes before the X11 includes which #define the symbol None
// (see SVTK_SpaceMouse.h) to avoid the compilation error.
-#if
ndef WIN32
+#if
!defined(WIN32) && !defined(__APPLE__)
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include <xcb/xcb.h>
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include <xcb/xcb.h>
#endif
@@
-84,7
+84,7
@@
QVTK_RenderWindowInteractor
myRenderWindow->Delete();
myRenderWindow->DoubleBufferOn();
myRenderWindow->Delete();
myRenderWindow->DoubleBufferOn();
-#if
ndef WIN32
+#if
!defined WIN32 && !defined __APPLE__
myRenderWindow->SetDisplayId((void*)QX11Info::display());
#endif
myRenderWindow->SetWindowId((void*)winId());
myRenderWindow->SetDisplayId((void*)QX11Info::display());
#endif
myRenderWindow->SetWindowId((void*)winId());
@@
-112,7
+112,7
@@
QVTK_RenderWindowInteractor
QVTK_RenderWindowInteractor
::~QVTK_RenderWindowInteractor()
{
QVTK_RenderWindowInteractor
::~QVTK_RenderWindowInteractor()
{
-#if
ndef WIN32
+#if
!defined WIN32 && !defined __APPLE__
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
SVTK_SpaceMouseX* aSpaceMouse = SVTK_SpaceMouseX::getInstance();
if ( aSpaceMouse && aSpaceMouse->isSpaceMouseOn() )
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
SVTK_SpaceMouseX* aSpaceMouse = SVTK_SpaceMouseX::getInstance();
if ( aSpaceMouse && aSpaceMouse->isSpaceMouseOn() )
@@
-415,7
+415,7
@@
QVTK_RenderWindowInteractor
{
QWidget::focusInEvent( event );
{
QWidget::focusInEvent( event );
-#if
ndef WIN32
+#if
!defined WIN32 && !defined __APPLE__
// register set space mouse events receiver
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
SVTK_SpaceMouseX* aSpaceMouse = SVTK_SpaceMouseX::getInstance();
// register set space mouse events receiver
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
SVTK_SpaceMouseX* aSpaceMouse = SVTK_SpaceMouseX::getInstance();
@@
-451,7
+451,7
@@
QVTK_RenderWindowInteractor
{
QWidget::focusOutEvent( event );
{
QWidget::focusOutEvent( event );
-#if
ndef WIN32
+#if
!defined WIN32 && !defined __APPLE__
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
// unregister set space mouse events receiver
SVTK_SpaceMouseX* aSpaceMouse = SVTK_SpaceMouseX::getInstance();
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
// unregister set space mouse events receiver
SVTK_SpaceMouseX* aSpaceMouse = SVTK_SpaceMouseX::getInstance();
@@
-467,7
+467,7
@@
QVTK_RenderWindowInteractor
// TODO (QT5 PORTING) Below is a temporary solution, to allow compiling with Qt 5
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
// TODO (QT5 PORTING) Below is a temporary solution, to allow compiling with Qt 5
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-#if
def WIN32
+#if
defined(WIN32)
/*!
To handle native Win32 events (from such devices as SpaceMouse)
/*!
To handle native Win32 events (from such devices as SpaceMouse)
@@
-478,8
+478,7
@@
bool QVTK_RenderWindowInteractor::winEvent( MSG* msg, long* result )
return QWidget::winEvent( msg, result);
}
return QWidget::winEvent( msg, result);
}
-#else
-
+#elif !defined(__APPLE__)
/*!
To handle native X11 events (from such devices as SpaceMouse)
*/
/*!
To handle native X11 events (from such devices as SpaceMouse)
*/
@@
-519,9
+518,9
@@
QVTK_RenderWindowInteractor
bool QVTK_RenderWindowInteractor
::nativeEvent(const QByteArray& eventType, void* message, long* result)
{
bool QVTK_RenderWindowInteractor
::nativeEvent(const QByteArray& eventType, void* message, long* result)
{
-#if
def WIN32
+#if
defined(WIN32)
// TODO: WIN32-related implementation
// TODO: WIN32-related implementation
-#el
se
+#el
if !defined(__APPLE__)
if ( eventType == "xcb_generic_event_t" )
{
xcb_generic_event_t* ev = static_cast<xcb_generic_event_t *>(message);
if ( eventType == "xcb_generic_event_t" )
{
xcb_generic_event_t* ev = static_cast<xcb_generic_event_t *>(message);