From: skv <skv@opencascade.com>
Date: Mon, 21 Jul 2014 14:00:18 +0000 (+0400)
Subject: OCCT dev version porting (6.7.3)
X-Git-Tag: V7_5_0a1~31
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7087d151c50d4c687370eb79eefe9798c6cd2eec;p=modules%2Fgui.git

OCCT dev version porting (6.7.3)
---

diff --git a/src/OCCViewer/CMakeLists.txt b/src/OCCViewer/CMakeLists.txt
index de1434512..e9627c893 100755
--- a/src/OCCViewer/CMakeLists.txt
+++ b/src/OCCViewer/CMakeLists.txt
@@ -44,7 +44,7 @@ ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${OGL_DEFINITIONS})
 # libraries to link to
 SET(_link_LIBRARIES
   ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER} ${CAS_TKGeomAlgo}
-  ${CAS_TKTopAlgo} ${CAS_TKG2d}
+  ${CAS_TKTopAlgo} ${CAS_TKG2d} ${CAS_TKOpenGl}
   CASCatch qtx suit OpenGLUtils ViewerTools ViewerData
 )
 
diff --git a/src/OCCViewer/OCCViewer_VService.cxx b/src/OCCViewer/OCCViewer_VService.cxx
index b562813ad..3b99fc0a0 100755
--- a/src/OCCViewer/OCCViewer_VService.cxx
+++ b/src/OCCViewer/OCCViewer_VService.cxx
@@ -26,8 +26,14 @@
 #include <V3d_View.hxx>
 
 #include <Aspect_DisplayConnection.hxx>
+#include <Basics_OCCTVersion.hxx>
+#if OCC_VERSION_LARGE > 0x06070200 // for OCC-6.7.3 and higher version
+#include <OpenGl_GraphicDriver.hxx>
+#else
 #include <Graphic3d.hxx>
 #include <Graphic3d_GraphicDriver.hxx>
+#endif
+
 #ifdef WIN32
 #include <WNT_Window.hxx>
 #else
@@ -61,7 +67,11 @@ Handle(V3d_Viewer) OCCViewer_VService::CreateViewer( const Standard_ExtString na
 						     const Standard_Boolean computedMode,
 						     const Standard_Boolean defaultComputedMode )
 {
+#if OCC_VERSION_LARGE > 0x06070200 // for OCC-6.7.3 and higher version
+  static Handle(OpenGl_GraphicDriver) aGraphicDriver;
+#else
   static Handle(Graphic3d_GraphicDriver) aGraphicDriver;
+#endif
   if (aGraphicDriver.IsNull())
   {
     Handle(Aspect_DisplayConnection) aDisplayConnection;
@@ -70,7 +80,11 @@ Handle(V3d_Viewer) OCCViewer_VService::CreateViewer( const Standard_ExtString na
 #else
     aDisplayConnection = new Aspect_DisplayConnection();
 #endif
+#if OCC_VERSION_LARGE > 0x06070200 // for OCC-6.7.3 and higher version
+    aGraphicDriver = new OpenGl_GraphicDriver(aDisplayConnection);
+#else
     aGraphicDriver = Graphic3d::InitGraphicDriver( aDisplayConnection );
+#endif
   }
 
   return new V3d_Viewer( aGraphicDriver, name, domain, viewSize, viewProjection,