From 6e3e1494b2d40bfbcdd1ff37e31945ba052b3d46 Mon Sep 17 00:00:00 2001 From: jfa Date: Tue, 18 Apr 2006 15:40:43 +0000 Subject: [PATCH] Integrate a patch by Paul RASCLE for V3.2.0b1. --- src/PyInterp/PyInterp_base.cxx | 2 +- src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/PyInterp/PyInterp_base.cxx b/src/PyInterp/PyInterp_base.cxx index 0e0a5622c..1afac6ac2 100644 --- a/src/PyInterp/PyInterp_base.cxx +++ b/src/PyInterp/PyInterp_base.cxx @@ -224,7 +224,7 @@ int PyInterp_base::run(const char *command) _atFirst = false; return ret; } - ret = simpleRun("salome.salome_init()"); + ret = simpleRun("salome.salome_init(0,1)"); if (ret) { _atFirst = false; return ret; diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx index 62b41909f..604c599bf 100644 --- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx +++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx @@ -994,7 +994,8 @@ void SALOME_PYQT_Module::initInterp( int theStudyId ) return; } // ... then call a method - PyObjWrapper aRes( PyObject_CallMethod( aMod, "salome_init", "" ) ); + int embedded = 1; + PyObjWrapper aRes( PyObject_CallMethod( aMod, "salome_init", "ii", theStudyId, embedded ) ); if( !aRes ) { // Error! PyErr_Print(); -- 2.39.2