Update for latest OCCT (IR-2015-04-23)

diff --git a/src/OCCViewer/CMakeLists.txt b/src/OCCViewer/CMakeLists.txt
index 975d3b8ad214dd8a0b7947c4036945d92400276d..760e267f29f621a05ddc64967527220cd2c095c2 100755 (executable)
--- a/src/OCCViewer/CMakeLists.txt
+++ b/src/OCCViewer/CMakeLists.txt
@@ -42,9 +42,9 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${OGL_DEFINITIONS})
 
 # VSR: TEMPORARY, to be removed
-IF(OCCT_DEV_COMPAT)
-ADD_DEFINITIONS(-DOCCT_DEV_COMPAT)
-ENDIF(OCCT_DEV_COMPAT)
+IF(OCCT_690BETA_COMPAT)
+ADD_DEFINITIONS(-DOCCT_690BETA_COMPAT)
+ENDIF(OCCT_690BETA_COMPAT)
 
 # libraries to link to
 SET(_link_LIBRARIES

diff --git a/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx
index 107824adbc8a93fd31cc0e905bc4e1f5a850bb42..ea7231107be9c41ff1667e596dc9b38e690ec301 100644 (file)
--- a/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx
+++ b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx
@@ -265,7 +265,7 @@ void OCCViewer_CubeAxesDlg::ApplyData( const Handle(V3d_View)& theView )
     int aGap = 20;
 
 #if OCC_VERSION_LARGE > 0x06080000
-#ifdef OCCT_DEV_COMPAT // VSR: temporarily, to be removed later and replace below implementation
+#ifndef OCCT_690BETA_COMPAT // VSR: temporarily, to be removed later and replace below implementation
     Graphic3d_GraduatedTrihedron gt;
     // main params
     gt.SetDrawGrid(Standard_True);       // to draw grid
@@ -293,7 +293,7 @@ void OCCViewer_CubeAxesDlg::ApplyData( const Handle(V3d_View)& theView )
     }
     // draw trihedron
     theView->GraduatedTrihedronDisplay(gt);
-#else // #ifdef OCCT_DEV_COMPAT / VSR: temporarily, to be removed later and replace below implementation
+#else // #ifndef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation
     Graphic3d_GraduatedTrihedron gt;
     // main params
     gt.SetToDrawTickmarks(Standard_True);  // to draw grid
@@ -352,7 +352,7 @@ void OCCViewer_CubeAxesDlg::ApplyData( const Handle(V3d_View)& theView )
     gt.ChangeZAxisAspect().SetNameOffset(anAxisData[2].Offset + aGap); // see above
     // draw trihedron
     theView->GraduatedTrihedronDisplay(gt);
-#endif // #ifdef OCCT_DEV_COMPAT / VSR: temporarily, to be removed later and replace below implementation
+#endif // #ifdef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation
 #else
     theView->GraduatedTrihedronDisplay(
       anAxisData[0].Name.toLatin1().constData(),