0022145: [CEA 787] Regression on test_display.py

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 94004265d6ed70bb683b4bdaa924fc7bc4338506..9142c8da6e1802f267d8b2f98137e2f57ad0d656 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -486,7 +486,7 @@ void LightApp_Application::createActionForViewer( const int id,
 
 void LightApp_Application::createActions()
 {
-  STD_Application::createActions();
+  CAM_Application::createActions();
 
   SUIT_Desktop* desk = desktop();
   SUIT_ResourceMgr* resMgr = resourceMgr();
@@ -3462,7 +3462,7 @@ void LightApp_Application::addViewManager( SUIT_ViewManager* vm )
 {
   connect( vm, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
            this, SLOT( onCloseView( SUIT_ViewManager* ) ) );
-  STD_Application::addViewManager( vm );
+  CAM_Application::addViewManager( vm );
 }
 
 /*!
@@ -3476,6 +3476,8 @@ void LightApp_Application::removeViewManager( SUIT_ViewManager* vm )
   if (aStudy )
     aStudy->removeViewMgr(vm->getGlobalId());
 
+  CAM_Application::removeViewManager( vm );
+
   LightApp_SelectionMgr* selMgr = selectionMgr();
   QList<SUIT_Selector*> selectors;
   selMgr->selectors( selectors );
@@ -3485,8 +3487,6 @@ void LightApp_Application::removeViewManager( SUIT_ViewManager* vm )
     }
   }
 
-  STD_Application::removeViewManager( vm );
-
   // IPAL22894: Crash on closing OCC view
   //delete vm;
   vm->deleteLater();