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=dd6a525027712eb317fbbd0035323b7a0444af83;hpb=f830c97c748d8f8a6a7eccc8e3a58e19066a1181;p=modules%2Fgui.git

diff --git a/src/SVTK/SVTK_RenderWindowInteractor.h b/src/SVTK/SVTK_RenderWindowInteractor.h
index dd6a52502..e04a2edbf 100644
--- a/src/SVTK/SVTK_RenderWindowInteractor.h
+++ b/src/SVTK/SVTK_RenderWindowInteractor.h
@@ -1,30 +1,28 @@
-//  SALOME VTKViewer : build VTK viewer into Salome desktop
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
 //
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : 
 //  Author : 
-//  Module : SALOME
-//  $Header$
 
 #ifndef SVTK_RenderWindowInteractor_h
 #define SVTK_RenderWindowInteractor_h
@@ -33,7 +31,7 @@
 #include "SVTK_Selection.h"
 
 #include <vtkSmartPointer.h>
-#include <qwidget.h>
+#include <QWidget>
 
 // undefining min and max because CASCADE's defines them and
 // it clashes with std::min(), std::max()
@@ -69,7 +67,7 @@ class SVTK_EXPORT QVTK_RenderWindowInteractor: public QWidget
 
  public:
   QVTK_RenderWindowInteractor(QWidget* theParent, 
-			      const char* theName);
+                              const char* theName);
 
   ~QVTK_RenderWindowInteractor();
 
@@ -89,6 +87,9 @@ class SVTK_EXPORT QVTK_RenderWindowInteractor: public QWidget
   void
   InvokeEvent(unsigned long theEvent, void* theCallData);
 
+  //! Get paint engine for the scene
+  virtual QPaintEngine* paintEngine() const;
+
  public slots:
    //! Need for initial contents display on Win32
   virtual void show();
@@ -121,12 +122,16 @@ class SVTK_EXPORT QVTK_RenderWindowInteractor: public QWidget
   virtual void focusOutEvent( QFocusEvent* );
 
   //! To handle native events (from such devices as SpaceMouse)
-#ifdef WIN32
-  virtual bool winEvent( MSG* );
-#else
+// 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* );
+#elif !defined(__APPLE__)
   virtual bool x11Event( XEvent *e );
 #endif
-
+#else
+  virtual bool nativeEvent( const QByteArray&, void*, long* );
+#endif
   vtkSmartPointer<vtkRenderWindow> myRenderWindow;
   vtkSmartPointer<vtkGenericRenderWindowInteractor> myDevice;
 };
@@ -147,7 +152,7 @@ class SVTK_EXPORT SVTK_RenderWindowInteractor: public QVTK_RenderWindowInteracto
 
  public:
   SVTK_RenderWindowInteractor(QWidget* theParent, 
-			      const char* theName);
+                              const char* theName);
 
   ~SVTK_RenderWindowInteractor();
 
@@ -155,8 +160,8 @@ class SVTK_EXPORT SVTK_RenderWindowInteractor: public QVTK_RenderWindowInteracto
   virtual
   void
   Initialize(vtkGenericRenderWindowInteractor* theDevice,
-	     SVTK_Renderer* theRenderer,
-	     SVTK_Selector* theSelector);
+             SVTK_Renderer* theRenderer,
+             SVTK_Selector* theSelector);
 
   //----------------------------------------------------------------------------
   //! To get corresponding SVTK_Renderer instance
@@ -221,7 +226,6 @@ class SVTK_EXPORT SVTK_RenderWindowInteractor: public QVTK_RenderWindowInteracto
   virtual void wheelEvent( QWheelEvent* );
   virtual void keyPressEvent( QKeyEvent* );
   virtual void keyReleaseEvent( QKeyEvent* );
-  virtual void contextMenuEvent( QContextMenuEvent * e );
 
   void
   SetRenderer(SVTK_Renderer *theRenderer);
@@ -237,9 +241,9 @@ class SVTK_EXPORT SVTK_RenderWindowInteractor: public QVTK_RenderWindowInteracto
   static
   void
   ProcessEvents(vtkObject* theObject, 
-		unsigned long theEvent,
-		void* theClientData, 
-		void* theCallData);
+                unsigned long theEvent,
+                void* theClientData, 
+                void* theCallData);
 
   // Used to process VTK events
   vtkSmartPointer<vtkCallbackCommand> myEventCallbackCommand;