X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSVTK%2FSVTK_SpaceMouse.cxx;h=7e8e6abf89caaf9b71dda9e6c399bb206a2f4e04;hb=refs%2Fheads%2Fngr%2Fpython3_dev_pv5.4;hp=2990db6d97cdaae0024ae35f647df65dd30a9d61;hpb=53415443fa7c248984f053da559cc8765623088c;p=modules%2Fgui.git diff --git a/src/SVTK/SVTK_SpaceMouse.cxx b/src/SVTK/SVTK_SpaceMouse.cxx index 2990db6d9..7e8e6abf8 100644 --- a/src/SVTK/SVTK_SpaceMouse.cxx +++ b/src/SVTK/SVTK_SpaceMouse.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -30,7 +30,7 @@ #include -#ifndef WIN32 +#if !defined WIN32 && !defined __APPLE__ #include #include #include @@ -64,7 +64,7 @@ SVTK_SpaceMouse::SVTK_SpaceMouse() SVTK_SpaceMouseX::SVTK_SpaceMouseX() : SVTK_SpaceMouse() { -#ifndef WIN32 +#if !defined WIN32 && !defined __APPLE__ win = InputFocus; #endif } @@ -79,7 +79,7 @@ SVTK_SpaceMouseX* SVTK_SpaceMouseX::getInstance() return myInstance; } -#ifndef WIN32 +#if !defined WIN32 && !defined __APPLE__ 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() { -#ifndef WIN32 +#if !defined WIN32 && !defined __APPLE__ win = InputFocus; #endif } @@ -249,7 +249,7 @@ SVTK_SpaceMouseXCB* SVTK_SpaceMouseXCB::getInstance() /*! Initialization */ -#ifndef WIN32 +#if !defined WIN32 && !defined __APPLE__ int SVTK_SpaceMouseXCB::initialize( xcb_connection_t *connection, xcb_window_t window ) { // make request