From: asl <asl@opencascade.com>
Date: Tue, 15 Dec 2009 13:19:29 +0000 (+0000)
Subject: GEOM object now inherits default implementation of Parameterized object
X-Git-Tag: PHASE_17_Part1_V4~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=449b805c00ad8298c58d7d618f858dd899e2c161;p=modules%2Fgeom.git

GEOM object now inherits default implementation of Parameterized object
---

diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc
index adb3180e1..6c43c3bf0 100644
--- a/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc
@@ -1652,7 +1652,7 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::GetObject (CORBA::Long theStudyID, const char*
 
   GEOM::GEOM_Gen_ptr engine = _this();
   //transfer the reference to GEOM_Object_i
-  GEOM_Object_i* servant = new GEOM_Object_i (_poa, engine, handle_object);
+  GEOM_Object_i* servant = new GEOM_Object_i (_poa, engine, handle_object, GetNotebook( theStudyID ) );
   PortableServer::ObjectId_var id = _poa->activate_object(servant);
 
   obj = servant->_this();
diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc
index 83e536deb..9ca072c64 100644
--- a/src/GEOM_I/GEOM_Object_i.cc
+++ b/src/GEOM_I/GEOM_Object_i.cc
@@ -54,8 +54,8 @@
 //=============================================================================
 
 GEOM_Object_i::GEOM_Object_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine,
-			      Handle(GEOM_Object) theImpl)
-: SALOME::GenericObj_i( thePOA ), _engine(theEngine), _impl(theImpl)
+			      Handle(GEOM_Object) theImpl, SALOME::Notebook_ptr theNotebook )
+  : SALOME_ParameterizedObject( theNotebook ), _engine(theEngine), _impl(theImpl)
 {
 }