X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGLViewer%2FGLViewer_Object.h;h=bbf4df0e16ec182b0d2fd3907c1201183c9a8897;hb=refs%2Fheads%2Fngr%2Fpython3_dev_pv5.4;hp=d6abc6ea936c023de2f820340fe5f997b2e72986;hpb=aa05f2a1b23a54321ea7248ae9ac3463652c734e;p=modules%2Fgui.git

diff --git a/src/GLViewer/GLViewer_Object.h b/src/GLViewer/GLViewer_Object.h
index d6abc6ea9..bbf4df0e1 100644
--- a/src/GLViewer/GLViewer_Object.h
+++ b/src/GLViewer/GLViewer_Object.h
@@ -1,47 +1,50 @@
-//  Copyright (C) 2005 OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  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.
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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.
+// 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.
 //
-//  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
+// 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.
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// 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
 //
-//  Author : OPEN CASCADE
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+//  Author : OPEN CASCADE
 // File:      GLViewer_Object.h
 // Created:   November, 2004
-
+//
 #ifndef GLVIEWER_OBJECT_H
 #define GLVIEWER_OBJECT_H
 
-#ifdef WNT
+#ifdef WIN32
 #include <windows.h>
 #endif
 
 #include "GLViewer.h"
-#include "GLViewer_Defs.h"
 #include "GLViewer_Geom.h"
 
-#include <SUIT_DataOwner.h>
-
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#else
 #include <GL/gl.h>
+#endif
+
+#include <QString>
 
-#include <qfile.h>
-#include <qstring.h>
-#include <qrect.h>
+class QFile;
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( disable:4251 )
 #endif
 
@@ -50,7 +53,9 @@ class GLViewer_AspectLine;
 class GLViewer_Group;
 class GLViewer_CoordSystem;
 class GLViewer_Text;
-class GLViewer_Owner;
+//class GLViewer_Owner;
+
+class SUIT_DataOwner;
 
 /*! 
  * Class GLViewer_Object
@@ -82,7 +87,7 @@ public:
    *\param isCircle - = true if sensitive area of detection is round
   */
   virtual GLboolean         highlight( GLfloat x,
-				       GLfloat y,
+                                       GLfloat y,
                                        GLfloat tol,
                                        GLboolean isCircle = GL_FALSE ) = 0;
   //! Clears all highlight information
@@ -233,9 +238,9 @@ public:
   virtual bool              translateToEMF( HDC dc, GLViewer_CoordSystem* aViewerCS, GLViewer_CoordSystem* aEMFCS ) = 0;
 #endif
   //!\warning It is for ouv
-  GLViewer_Owner*           owner() const { return myOwner; }
+  SUIT_DataOwner*           owner() const { return myOwner; }
   //!\warning It is for ouv
-  void                      setOwner( GLViewer_Owner* owner ) { myOwner = owner; }
+  void                      setOwner( SUIT_DataOwner* owner ) { myOwner = owner; }
   
   //! Adds object to group theGroup
   void                      setGroup( GLViewer_Group* theGroup );
@@ -297,27 +302,13 @@ protected:
   bool                      myIsVisible;
 
   //!\warning It is for ouv
-  GLViewer_Owner*           myOwner;
+  SUIT_DataOwner*           myOwner;
 
   //! Object Group
   GLViewer_Group*           myGroup;
 };
 
-
-//!\warning It is for ouv
-class GLVIEWER_API GLViewer_Owner : public SUIT_DataOwner
-{
-public:
-  //!\warning It is for ouv
-  GLViewer_Owner() : SUIT_DataOwner() {}
-  //!\warning It is for ouv
-  ~GLViewer_Owner() {}
-
-protected:
-
-};
-
-#ifdef WNT
+#ifdef WIN32
 #pragma warning ( default:4251 )
 #endif