From: rnv <rnv@opencascade.com>
Date: Thu, 23 Nov 2017 14:46:41 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/imn/IMACS' into imn/IMACS_8_3_0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9feb50a251744b8079cb7cf06d17c0ea744ddc11;p=modules%2Fgui.git

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

9feb50a251744b8079cb7cf06d17c0ea744ddc11
diff --cc src/SALOME_SWIG/SALOMEGUI_Swig.cxx
index bcd1e54ad,474eb1dbb..9a066f180
--- a/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();
          }