Remove GEOMBase dependence.

diff --git a/src/CurveCreator/CurveCreator_Widget.cxx b/src/CurveCreator/CurveCreator_Widget.cxx
index c94ab8f4ccb8e09a894f2835a85f3a7f1a64dcc6..132857ca0a6f9112071b12d2d8c6bcad14448902 100644 (file)
--- a/src/CurveCreator/CurveCreator_Widget.cxx
+++ b/src/CurveCreator/CurveCreator_Widget.cxx
@@ -7,9 +7,9 @@
 #include "CurveCreator_NewSectionDlg.h"
 
 #include <GEOMUtils.hxx>
-#include <GEOMBase_Helper.h>
 
 #include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_ViewManager.h>
 
@@ -304,10 +304,13 @@ void CurveCreator_Widget::onNewPoint()
   myNewPointEditor->setSectionName(aSectName);
   myNewPointEditor->setDimension(myCurve->getDimension());
 
-  SUIT_ViewWindow* aViewWindow = GEOMBase_Helper::getActiveView();
-  SUIT_ViewManager* aViewManager = aViewWindow->getViewManager();
+  SUIT_ViewWindow* aViewWindow = 0;
+  SUIT_Study* activeStudy = SUIT_Session::session()->activeApplication()->activeStudy();
+  if ( activeStudy )
+    aViewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
   if ( aViewWindow == 0 )
     return;
+  SUIT_ViewManager* aViewManager = aViewWindow->getViewManager();
   if ( aViewManager->getType() == OCCViewer_Viewer::Type() ) {
     connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
              this, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) );

diff --git a/src/CurveCreator/Makefile.am b/src/CurveCreator/Makefile.am
index d92dd4f5cde56e4cd351aed8a305672043987418..89faab32ac80ee90b91e0222a2e7fae8798d442b 100644 (file)
--- a/src/CurveCreator/Makefile.am
+++ b/src/CurveCreator/Makefile.am
@@ -90,7 +90,6 @@ libCurveCreator_la_CPPFLAGS =         \
        $(CORBA_INCLUDES)               \
        -I$(srcdir)/../GEOMGUI          \
        -I$(srcdir)/../GEOMUtils        \
-       -I$(srcdir)/../GEOMBase         \
        -I$(top_builddir)/idl
 
 
@@ -102,5 +101,4 @@ libCurveCreator_la_LDFLAGS  =               \
        $(KERNEL_LDFLAGS)               \
        $(GUI_LDFLAGS) -lqtx -lsuit     \
        ../GEOMUtils/libGEOM.la         \
-       ../GEOMUtils/libGEOMUtils.la    \
-       ../GEOMUtils/libGEOMBase.la     
+       ../GEOMUtils/libGEOMUtils.la