Updated copyright comment

[modules/gui.git] / src / OCCViewer / OCCViewer_VService.cxx

diff --git a/src/OCCViewer/OCCViewer_VService.cxx b/src/OCCViewer/OCCViewer_VService.cxx
old mode 100755 (executable)
new mode 100644 (file)
index fe2a8a6..4ccf7eb
--- a/src/OCCViewer/OCCViewer_VService.cxx
+++ b/src/OCCViewer/OCCViewer_VService.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // 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.
+// 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
@@ -25,24 +25,35 @@
 #include <V3d_Viewer.hxx>
 #include <V3d_View.hxx>
 
+#include <OpenGl_GraphicDriver.hxx>
 #include <Aspect_DisplayConnection.hxx>
-#include <Graphic3d.hxx>
-#include <Graphic3d_GraphicDriver.hxx>
-#ifdef WIN32
+
+#if defined(WIN32)
 #include <WNT_Window.hxx>
+#elif defined(__APPLE__)
+#include <Cocoa_Window.hxx>
 #else
 #include <Xw_Window.hxx>
 #endif
 
+#include <Basics_OCCTVersion.hxx>
+
 /*!
     Create native view window for CasCade view [ static ]
 */
 Handle(Aspect_Window) OCCViewer_VService::CreateWindow( const Handle(V3d_View)& view,
                                                        WId winId )
 {
+#if OCC_VERSION_LARGE < 0x07070000
   Aspect_Handle aWindowHandle = (Aspect_Handle)winId;
-#ifdef WIN32
+#else
+  Aspect_Drawable aWindowHandle = (Aspect_Drawable)winId;
+#endif
+
+#if defined(WIN32)
   Handle(WNT_Window) viewWindow = new WNT_Window( aWindowHandle );
+#elif defined(__APPLE__)
+  Handle(Cocoa_Window) viewWindow = new Cocoa_Window( (NSView*)winId );
 #else
   Handle(Aspect_DisplayConnection) aDispConnection = view->Viewer()->Driver()->GetDisplayConnection();
   Handle(Xw_Window) viewWindow = new Xw_Window( aDispConnection, aWindowHandle );
@@ -53,27 +64,9 @@ Handle(Aspect_Window) OCCViewer_VService::CreateWindow( const Handle(V3d_View)&
 /*!
     Creates viewer 3d [ static ]
 */
-Handle(V3d_Viewer) OCCViewer_VService::CreateViewer( const Standard_ExtString name,
-                                                    const Standard_CString displayName,
-                                                    const Standard_CString domain,
-                                                    const Standard_Real viewSize ,
-                                                    const V3d_TypeOfOrientation viewProjection,
-                                                    const Standard_Boolean computedMode,
-                                                    const Standard_Boolean defaultComputedMode )
+Handle(V3d_Viewer) OCCViewer_VService::CreateViewer()
 {
-  static Handle(Graphic3d_GraphicDriver) aGraphicDriver;
-  if (aGraphicDriver.IsNull())
-  {
-    Handle(Aspect_DisplayConnection) aDisplayConnection;
-#ifndef WIN32
-    aDisplayConnection = new Aspect_DisplayConnection( displayName );
-#else
-    aDisplayConnection = new Aspect_DisplayConnection();
-#endif
-    aGraphicDriver = Graphic3d::InitGraphicDriver( aDisplayConnection );
-  }
-
-  return new V3d_Viewer( aGraphicDriver, name, domain, viewSize, viewProjection,
-                        Quantity_NOC_GRAY30, V3d_ZBUFFER, V3d_GOURAUD, V3d_WAIT,
-                        computedMode, defaultComputedMode, V3d_TEX_NONE );
+  Handle(OpenGl_GraphicDriver) aGraphicDriver =
+    new OpenGl_GraphicDriver(new Aspect_DisplayConnection());
+  return new V3d_Viewer(aGraphicDriver);
 }