Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/gui.git] / src / PyInterp / PyInterp_base.h

diff --git a/src/PyInterp/PyInterp_base.h b/src/PyInterp/PyInterp_base.h
index 63a11f82f8c3cbede3a64adc702eb1c19cf86717..298b1c5088b2d3f8753017590d173a414f156d0d 100644 (file)
--- a/src/PyInterp/PyInterp_base.h
+++ b/src/PyInterp/PyInterp_base.h
@@ -1,13 +1,26 @@
-//  SALOME SALOMEGUI : implementation of desktop and GUI kernel
+// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either 
+// version 2.1 of the License.
+// 
+// This library is distributed in the hope that it will be useful 
+// but WITHOUT ANY WARRANTY; without even the implied warranty of 
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// Lesser General Public License for more details.
 //
-//  Copyright (C) 2003  CEA/DEN, EDF R&D
+// You should have received a copy of the GNU Lesser General Public  
+// License along with this library; if not, write to the Free Software 
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+//  SALOME SALOMEGUI : implementation of desktop and GUI kernel
 //
 //  File   : PyInterp_base.h
 //  Author : Christian CAREMOLI, Paul RASCLE, EDF
 //  Module : SALOME
-//  $Header$
 
 #ifndef _PYINTERP_BASE_H_
 #define _PYINTERP_BASE_H_
@@ -23,9 +36,16 @@
 //#include <pthread.h>  // must be before Python.h !
 
 #include <Python.h>   // must be before qt includes ...
+#include <compile.h>   // Python include needed for versions before 2.4. Included in Python.h now.
+#include <eval.h>   // Python include needed for versions before 2.4. Included in Python.h now.
+
+//#if PY_VERSION_HEX < 0x02040000 // python version earlier than 2.4.0
+//extern "C" PyObject * PyEval_EvalCode(PyObject *co, PyObject *g, PyObject *l);
+//#endif
 
-#ifndef WNT
-extern "C" PyObject * PyEval_EvalCode(PyObject *co, PyObject *g, PyObject *l);
+/* For 2.3, use the PyGILState_ calls */
+#if (PY_VERSION_HEX >= 0x02030000)
+#define USE_GILSTATE
 #endif
 
 #define TOP_HISTORY_PY "--- top of history ---"
@@ -35,31 +55,40 @@ class PYINTERP_EXPORT PyLockWrapper
 {
   PyThreadState* myThreadState;
   PyThreadState* mySaveThreadState;
+#if defined(USE_GILSTATE)
+  PyGILState_STATE _savestate ;
+#endif
  public:
   PyLockWrapper(PyThreadState* theThreadState);
   ~PyLockWrapper();
 };
 
+typedef void PyOutChanged(void* data,char * c);
 
 class PYINTERP_EXPORT PyInterp_base{
  public:
   static int _argc;
   static char* _argv[];
   static PyObject *builtinmodule;
+  static PyThreadState *_gtstate;
+  static PyInterpreterState *_interp;
   
   PyInterp_base();
   ~PyInterp_base();
   
   virtual void initialize();
-  static void init_python();
+  virtual void init_python();
+  // init_python() made virtual to:
+  // 1. Remove dependency on KERNEL in light SALOME configuration
+  // 2. Allow redefinition of this method in SalomeApp_PyInterp class (it should be empty there and rely on KERNEL_PYTHON)
 
   virtual int run(const char *command); 
 
   PyLockWrapper GetLockWrapper();
 
   std::string getbanner(); 
-  std::string getverr();
-  std::string getvout();  
+  void setverrcb(PyOutChanged*,void*);
+  void setvoutcb(PyOutChanged*,void*);
 
   const char * getPrevious();
   const char * getNext();    
@@ -115,4 +144,13 @@ public:
   }
 };
 
+
+typedef struct {
+  PyObject_HEAD
+  int softspace;
+  PyOutChanged* _cb;
+  void* _data;
+  bool _iscerr;
+} PyStdOut;
+
 #endif