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 66847770d1eb66234747a29bb542c5d34aa15ab3..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_
@@ -50,6 +63,8 @@ class PYINTERP_EXPORT PyLockWrapper
   ~PyLockWrapper();
 };
 
+typedef void PyOutChanged(void* data,char * c);
+
 class PYINTERP_EXPORT PyInterp_base{
  public:
   static int _argc;
@@ -72,8 +87,8 @@ class PYINTERP_EXPORT PyInterp_base{
   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();    
@@ -129,4 +144,13 @@ public:
   }
 };
 
+
+typedef struct {
+  PyObject_HEAD
+  int softspace;
+  PyOutChanged* _cb;
+  void* _data;
+  bool _iscerr;
+} PyStdOut;
+
 #endif