Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'occ/19960'
[modules/gui.git]
/
src
/
SalomeApp
/
SalomeApp_PyInterp.h
diff --git
a/src/SalomeApp/SalomeApp_PyInterp.h
b/src/SalomeApp/SalomeApp_PyInterp.h
old mode 100755
(executable)
new mode 100644
(file)
index
a0b6a3e
..
dfa0747
--- a/
src/SalomeApp/SalomeApp_PyInterp.h
+++ b/
src/SalomeApp/SalomeApp_PyInterp.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
//
// 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
//
//
// 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
// 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_
Enh
Interp
+class SalomeApp_PyInterp : public PyConsole_Interp
{
friend class SalomeApp_Application;
public:
virtual ~SalomeApp_PyInterp();
{
friend class SalomeApp_Application;
public:
virtual ~SalomeApp_PyInterp();
- virtual void initPython();
virtual void initStudy();
virtual void closeContext();
protected:
SalomeApp_PyInterp();
virtual void initStudy();
virtual void closeContext();
protected:
SalomeApp_PyInterp();
+ virtual bool initContext();
virtual int beforeRun();
private:
virtual int beforeRun();
private:
@@
-49,4
+47,4
@@
private:
bool myFirstInitStudy;
};
bool myFirstInitStudy;
};
-#endif
+#endif
// SALOMEAPP_PYINTERP_H