Merge branch 'master' into agy/NewPV1_For_850

[modules/gui.git] / src / SalomeApp / SalomeApp_PyInterp.h

diff --git a/src/SalomeApp/SalomeApp_PyInterp.h b/src/SalomeApp/SalomeApp_PyInterp.h
index a0b6a3ec2b8dce607e4ad71390e159dfcbdf9f77..45bbc0178e488b242c2f4cca51623954b1aca364 100755 (executable)
--- a/src/SalomeApp/SalomeApp_PyInterp.h
+++ b/src/SalomeApp/SalomeApp_PyInterp.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,29 +19,27 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
-//  SALOME SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SalomeApp_PyInterp.h
 //  Author : Nicolas REJNERI
 
-#ifndef _SalomeApp_PYINTERP_H_
-#define _SalomeApp_PYINTERP_H_
+#ifndef SALOMEAPP_PYINTERP_H
+#define SALOMEAPP_PYINTERP_H
 
-#include <PyConsole_EnhInterp.h> // this include must be first (see PyInterp_base.h)!
+#include <PyConsole_Interp.h>
 
-class SalomeApp_PyInterp : public PyConsole_EnhInterp
+class SalomeApp_PyInterp : public PyConsole_Interp
 {
   friend class SalomeApp_Application;
 
 public:
   virtual ~SalomeApp_PyInterp();
 
-  virtual void initPython();
   virtual void initStudy();
   virtual void closeContext();
 
 protected:
   SalomeApp_PyInterp();
+  virtual bool initContext();
   virtual int  beforeRun();
 
 private:
@@ -49,4 +47,4 @@ private:
   bool myFirstInitStudy;
 };
 
-#endif
+#endif // SALOMEAPP_PYINTERP_H