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
Merge Python 3 porting.
[modules/gui.git]
/
src
/
SVTK
/
SVTK_SpaceMouse.cxx
diff --git
a/src/SVTK/SVTK_SpaceMouse.cxx
b/src/SVTK/SVTK_SpaceMouse.cxx
index 5db6b427da0c2f3e92882e2e5e0505c372e1111b..7e8e6abf89caaf9b71dda9e6c399bb206a2f4e04 100644
(file)
--- a/
src/SVTK/SVTK_SpaceMouse.cxx
+++ b/
src/SVTK/SVTK_SpaceMouse.cxx
@@
-30,7
+30,7
@@
#include <QtGlobal>
#include <QtGlobal>
-#if
ndef WIN32
+#if
!defined WIN32 && !defined __APPLE__
#include <X11/X.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/X.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
@@
-64,7
+64,7
@@
SVTK_SpaceMouse::SVTK_SpaceMouse()
SVTK_SpaceMouseX::SVTK_SpaceMouseX()
: SVTK_SpaceMouse()
{
SVTK_SpaceMouseX::SVTK_SpaceMouseX()
: SVTK_SpaceMouse()
{
-#if
ndef WIN32
+#if
!defined WIN32 && !defined __APPLE__
win = InputFocus;
#endif
}
win = InputFocus;
#endif
}
@@
-79,7
+79,7
@@
SVTK_SpaceMouseX* SVTK_SpaceMouseX::getInstance()
return myInstance;
}
return myInstance;
}
-#if
ndef WIN32
+#if
!defined WIN32 && !defined __APPLE__
static int errorCallback( Display *display, XErrorEvent *Error )
{
static int errorCallback( Display *display, XErrorEvent *Error )
{
@@
-232,7
+232,7
@@
int SVTK_SpaceMouseX::translateEvent( Display* display, XEvent* xEvent, MoveEven
SVTK_SpaceMouseXCB::SVTK_SpaceMouseXCB()
: SVTK_SpaceMouse()
{
SVTK_SpaceMouseXCB::SVTK_SpaceMouseXCB()
: SVTK_SpaceMouse()
{
-#if
ndef WIN32
+#if
!defined WIN32 && !defined __APPLE__
win = InputFocus;
#endif
}
win = InputFocus;
#endif
}
@@
-249,7
+249,7
@@
SVTK_SpaceMouseXCB* SVTK_SpaceMouseXCB::getInstance()
/*!
Initialization
*/
/*!
Initialization
*/
-#if
ndef WIN32
+#if
!defined WIN32 && !defined __APPLE__
int SVTK_SpaceMouseXCB::initialize( xcb_connection_t *connection, xcb_window_t window )
{
// make request
int SVTK_SpaceMouseXCB::initialize( xcb_connection_t *connection, xcb_window_t window )
{
// make request