Fix some bugs with last view removing

diff --git a/src/NewGeom/NewGeom_SalomeViewer.cpp b/src/NewGeom/NewGeom_SalomeViewer.cpp
index 41baca6a8937cc1d7e4cde50380bf4e8d22225b1..6803bfe8c910d1d64672832c4c29af4d5c6fe480 100644 (file)
--- a/src/NewGeom/NewGeom_SalomeViewer.cpp
+++ b/src/NewGeom/NewGeom_SalomeViewer.cpp
@@ -118,8 +118,8 @@ void NewGeom_SalomeViewer::setSelector(NewGeom_OCCSelector* theSel)
           this, SLOT(onDeleteView(SUIT_ViewWindow*)));
   connect(aMgr, SIGNAL(viewCreated(SUIT_ViewWindow*)), 
           this, SLOT(onViewCreated(SUIT_ViewWindow*)));
-  connect(aMgr, SIGNAL(activated(SUIT_ViewWindow*)), 
-          this, SLOT(onActivated(SUIT_ViewWindow*)));
+  connect(aMgr, SIGNAL(activated(SUIT_ViewManager*)), 
+          this, SLOT(onActivated(SUIT_ViewManager*)));
 
   connect(aMgr, SIGNAL(mousePress(SUIT_ViewWindow*, QMouseEvent*)), this,
           SLOT(onMousePress(SUIT_ViewWindow*, QMouseEvent*)));
@@ -248,9 +248,9 @@ void NewGeom_SalomeViewer::onViewCreated(SUIT_ViewWindow* theView)
 }
 
 //**********************************************
-void NewGeom_SalomeViewer::onActivated(SUIT_ViewWindow* theView)
+void NewGeom_SalomeViewer::onActivated(SUIT_ViewManager* theMgr)
 {
-  myView->setCurrentView(theView);
+  myView->setCurrentView(theMgr->getActiveView());
   emit activated(myView);
 }
 

diff --git a/src/NewGeom/NewGeom_SalomeViewer.h b/src/NewGeom/NewGeom_SalomeViewer.h
index dcc9acee16cd96026d84a945b48f876ec9baa34a..56ba4f8240c93750096f4fed596594f2ab53ed7c 100644 (file)
--- a/src/NewGeom/NewGeom_SalomeViewer.h
+++ b/src/NewGeom/NewGeom_SalomeViewer.h
@@ -148,7 +148,7 @@ Q_OBJECT
   void onTryCloseView(SUIT_ViewWindow*);
   void onDeleteView(SUIT_ViewWindow*);
   void onViewCreated(SUIT_ViewWindow*);
-  void onActivated(SUIT_ViewWindow*);
+  void onActivated(SUIT_ViewManager*);
 
   void onSelectionChanged();
   void onViewTransformed(OCCViewer_ViewWindow::OperationType);