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 adb3180e10e81589979061eab05c63f39f3b5912..6c43c3bf04d4ebb3ef7d91fc30cf0a987a65ae85 100644 (file)
--- 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 83e536debb16c5c678c50f4ea4707a4deacb3770..9ca072c649ab1bfb37a5f191de607e3cbfadf5f0 100644 (file)
--- 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)
 {
 }