X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSVTK%2FSVTK_RenderWindowInteractor.h;h=e04a2edbfd9d48bd08df692566afbf527d79a27e;hb=refs%2Fheads%2Fngr%2Fpython3_dev_pv5.4;hp=5d3382803fa9d5c1cb55cd8752a5b3774530a2e1;hpb=7397622d22624ab84dd52c68a276e2cf50d262fb;p=modules%2Fgui.git diff --git a/src/SVTK/SVTK_RenderWindowInteractor.h b/src/SVTK/SVTK_RenderWindowInteractor.h index 5d3382803..e04a2edbf 100644 --- a/src/SVTK/SVTK_RenderWindowInteractor.h +++ b/src/SVTK/SVTK_RenderWindowInteractor.h @@ -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 @@ -124,9 +124,9 @@ class SVTK_EXPORT QVTK_RenderWindowInteractor: public QWidget //! To handle native events (from such devices as SpaceMouse) // TODO (QT5 PORTING) Below is a temporary solution, to allow compiling with Qt 5 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) -#ifdef WIN32 +#if defined(WIN32) virtual bool winEvent( MSG*, long* ); -#else +#elif !defined(__APPLE__) virtual bool x11Event( XEvent *e ); #endif #else