RNV: fix compilation with the dev version of OCCT.

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

diff --git a/src/OCCViewer/OCCViewer_AISSelector.cxx b/src/OCCViewer/OCCViewer_AISSelector.cxx
index 8cf27d902db75f3c7f7a0e501fc65bf0bc873ab7..c15c45e4ed7faf811692b16fa2f33a876accfa28 100755 (executable)
--- a/src/OCCViewer/OCCViewer_AISSelector.cxx
+++ b/src/OCCViewer/OCCViewer_AISSelector.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  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
@@ -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
@@ -22,6 +22,8 @@
 
 #include "OCCViewer_AISSelector.h"
 
+#include <Basics_OCCTVersion.hxx>
+
 /*!
   Constructor
 */
@@ -69,8 +71,14 @@ void OCCViewer_AISSelector::enableMultipleSelection( bool bEnable )
 void OCCViewer_AISSelector::setHilightColor ( Quantity_NameOfColor color )
 {
   myHilightColor = color;
-  if ( !myAISContext.IsNull() )
-    myAISContext->SetHilightColor( myHilightColor );
+  if ( !myAISContext.IsNull() ) {
+#if OCC_VERSION_LARGE > 0x07000000    
+    const Handle(Graphic3d_HighlightStyle)& hStyle = myAISContext->HighlightStyle();
+    hStyle->SetColor( myHilightColor );
+#else
+  myAISContext->SetHilightColor( myHilightColor );
+#endif  
+  }
 }
 
 /*!
@@ -79,8 +87,14 @@ void OCCViewer_AISSelector::setHilightColor ( Quantity_NameOfColor color )
 void OCCViewer_AISSelector::setSelectColor ( Quantity_NameOfColor color )
 {
   mySelectColor = color;
-  if ( !myAISContext.IsNull() )
+  if ( !myAISContext.IsNull() ) {
+#if OCC_VERSION_LARGE > 0x07000000
+    const Handle(Graphic3d_HighlightStyle)& sStyle = myAISContext->SelectionStyle();
+    sStyle->SetColor( mySelectColor );
+#else    
     myAISContext->SelectionColor( mySelectColor );
+#endif
+  }
 }
 
 /*!
@@ -90,8 +104,15 @@ void OCCViewer_AISSelector::setAISContext ( const Handle (AIS_InteractiveContext
 {
   myAISContext = aisContext;
   if ( ! myAISContext.IsNull() ) { 
+#if OCC_VERSION_LARGE > 0x07000000
+    const Handle(Graphic3d_HighlightStyle)& hStyle = myAISContext->HighlightStyle();
+    const Handle(Graphic3d_HighlightStyle)& sStyle = myAISContext->SelectionStyle();
+    hStyle->SetColor( myHilightColor );
+    sStyle->SetColor( mySelectColor );
+#else
     myAISContext->SetHilightColor( myHilightColor );
     myAISContext->SelectionColor( mySelectColor );
+#endif    
     myAISContext->SetSubIntensityColor( Quantity_NOC_CYAN1 );
   }
 }