Switch development flag to 1

[modules/hexablock.git] / src / HEXABLOCKGUI / HEXABLOCKGUI_SalomeTools.cxx

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx
index 27a62c43d07076589a73b7ad9dad8a5c7d4bce46..1dae5ca782ea2dfdedc600aabb0c3e7088aaa9be 100644 (file)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx
@@ -28,11 +28,8 @@
 #include <vtkActorCollection.h>
 #include <vtkUnstructuredGrid.h>
 
-#include <Basics_OCCTVersion.hxx>
-
 #include <SUIT_Session.h>
 
-#include <SalomeApp_Study.h>
 #include <SalomeApp_Application.h>
 
 #include <OCCViewer_ViewWindow.h>
@@ -89,13 +86,12 @@ namespace GUI
        }
 
 
-       _PTR(Study) GetActiveStudyDocument()
+       _PTR(Study) getStudy()
        {
-               SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>(GetActiveStudy());
-               if (aStudy)
-                       return aStudy->studyDS();
-               else
-                       return _PTR(Study)();
+      static _PTR(Study) _study;
+        if(!_study)
+          _study = SalomeApp_Application::getStudy();
+      return _study;
        }
 
 
@@ -175,14 +171,10 @@ namespace GUI
                        Handle(SelectMgr_Selection) sel = theObj->Selection( m );
 
                        for ( sel->Init(); sel->More(); sel->Next() ) {
-#if OCC_VERSION_LARGE > 0x06080100
                                 const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive();
                                 if ( aHSenEntity.IsNull() )
                                         continue;
                                 Handle(SelectBasics_SensitiveEntity) entity = aHSenEntity->BaseSensitive();
-#else
-                               Handle(SelectBasics_SensitiveEntity) entity = sel->Sensitive();
-#endif
                                if ( entity.IsNull() )
                                        continue;