Integration of development done in the MERGE_MULTIPR_EVOLUTION CVS branch

diff --git a/src/MULTIPRGUI/MULTIPR_GUI.cxx b/src/MULTIPRGUI/MULTIPR_GUI.cxx
index 8475e1d68f2e330ab4709b0594c23661607cb469..466a8daacb8b0d0bf67227d9e385c2aee81bae5f 100644 (file)
--- a/src/MULTIPRGUI/MULTIPR_GUI.cxx
+++ b/src/MULTIPRGUI/MULTIPR_GUI.cxx
@@ -374,6 +374,20 @@ bool MULTIPR_GUI::activateModule(SUIT_Study* theStudy)
       aStudyDS = _CAST(Study,aStudy)->GetStudy();
     aGen->SetCurrentStudy(aStudyDS);
 
+    // Init mMULTIPRObj
+    _PTR(SComponent) aSComp = aStudy->FindComponent(name());
+    if (aSComp) {
+      _PTR(ChildIterator) it (aStudy->NewChildIterator(aSComp));
+      if (it->More()) {
+        _PTR(SObject) aSObj = it->Value();
+        string anIOR = aSObj->GetIOR();
+        if (!anIOR.empty()) {
+          CORBA::Object_var anObj = getApp()->orb()->string_to_object(anIOR.c_str());
+          mMULTIPRObj = MULTIPR_ORB::MULTIPR_Obj::_narrow(anObj);
+        }
+      }
+    }
+
     return bOk;
 }