Merge remote-tracking branch 'origin/imn/IMACS' into imn/IMACS_8_3_0

diff --cc src/PVViewer/PVViewer_GUIElements.cxx
Simple merge

diff --cc src/SALOME_SWIG/SALOMEGUI_Swig.cxx
index bcd1e54adb8368ae41521dcacf05f8860f04e6da,474eb1dbb8e139564dcb1a6afb2ac6239a8c9ee9..9a066f180530adcc6c353d41f811b6f6340d802b
--- 1/src/SALOME_SWIG/SALOMEGUI_Swig.cxx
--- 2/src/SALOME_SWIG/SALOMEGUI_Swig.cxx
+++ b/src/SALOME_SWIG/SALOMEGUI_Swig.cxx
@@@ -624,11 -623,9 +624,11 @@@ public
    virtual void Execute()
    {
      if ( LightApp_Application* anApp = getApplication() ) {
 -      SUIT_ViewWindow* window = anApp->desktop()->activeWindow();
 +      SUIT_ViewManager* viewMgr = anApp->activeViewManager();
 +      if (!viewMgr) return;
 +      SUIT_ViewWindow* window = viewMgr->getActiveView();
        if ( window ) {
-         SALOME_View* view = dynamic_cast<SALOME_View*>( window->getViewManager()->getActiveView() );
+         SALOME_View* view = dynamic_cast<SALOME_View*>( window->getViewManager()->getViewModel() );
          if ( view ) {
            SALOME_Prs* aPrs = view->CreatePrs( myEntry.toLatin1() );
            myResult = !aPrs->IsNull();
@@@ -654,11 -651,9 +654,11 @@@ void SALOMEGUI_Swig::UpdateView(
      virtual void Execute()
      {
        if ( LightApp_Application* anApp = getApplication() ) {
 -        SUIT_ViewWindow* window = anApp->desktop()->activeWindow();
 +        SUIT_ViewManager* viewMgr = anApp->activeViewManager();
 +        if (!viewMgr) return;
 +        SUIT_ViewWindow* window = viewMgr->getActiveView();
          if ( window ) {
-           SALOME_View* view = dynamic_cast<SALOME_View*>( window->getViewManager()->getActiveView() );
+           SALOME_View* view = dynamic_cast<SALOME_View*>( window->getViewManager()->getViewModel() );
            if ( view )
              view->Repaint();
          }