wxPyEmptyStr --> wxEmptyString

[wxWidgets.git] / wxPython / src / gtk / streams.cpp

diff --git a/wxPython/src/gtk/streams.cpp b/wxPython/src/gtk/streams.cpp
index b4efd336e519b34e4dafa28957ae2c7ea460ae8f..98d61715246d0c08e2c5591d39bb364057452686 100644 (file)
--- a/wxPython/src/gtk/streams.cpp
+++ b/wxPython/src/gtk/streams.cpp
@@ -59,25 +59,6 @@ extern PyObject *SWIG_newvarlink(void);
 #include <wx/stream.h>
 #include <wx/list.h>
 
 #include <wx/stream.h>
 #include <wx/list.h>
 

-static PyObject* l_output_helper(PyObject* target, PyObject* o) {
-    PyObject*   o2;
-    if (!target) {
-        target = o;
-    } else if (target == Py_None) {
-        Py_DECREF(Py_None);
-        target = o;
-    } else {
-        if (!PyList_Check(target)) {
-            o2 = target;
-            target = PyList_New(0);
-            PyList_Append(target, o2);
-           Py_XDECREF(o2);
-        }
-        PyList_Append(target,o);
-       Py_XDECREF(o);
-    }
-    return target;
-}

 
 static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;


@@ -105,7 +86,11 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     return target;
 }
 
     return target;
 }
 

-static char* wxStringErrorMsg = "string type is required for parameter";
+#if PYTHON_API_VERSION >= 1009
+    static char* wxStringErrorMsg = "String or Unicode type required";
+#else
+    static char* wxStringErrorMsg = "String type required";
+#endif

   // C++
 // definitions of wxStringPtrList and wxPyInputStream
 #include <wx/listimpl.cpp>
   // C++
 // definitions of wxStringPtrList and wxPyInputStream
 #include <wx/listimpl.cpp>


@@ -157,14 +142,12 @@ wxString* wxPyInputStream::read(int size) {
         }
 
         // read until EOF
         }
 
         // read until EOF

-        wxPy_BEGIN_ALLOW_THREADS;

         while (! wxi->Eof()) {
             wxi->Read(buf, BUFSIZE);
             //*s += wxString(buf, wxi->LastRead());
             s->Append(buf, wxi->LastRead());
         }
         delete buf;
         while (! wxi->Eof()) {
             wxi->Read(buf, BUFSIZE);
             //*s += wxString(buf, wxi->LastRead());
             s->Append(buf, wxi->LastRead());
         }
         delete buf;

-        wxPy_END_ALLOW_THREADS;

 
         // error check
         if (wxi->LastError() == wxSTREAM_READ_ERROR) {
 
         // error check
         if (wxi->LastError() == wxSTREAM_READ_ERROR) {


@@ -181,10 +164,8 @@ wxString* wxPyInputStream::read(int size) {
         }
 
         // read size bytes
         }
 
         // read size bytes

-        wxPy_BEGIN_ALLOW_THREADS;

         wxi->Read(s->GetWriteBuf(size+1), size);
         s->UngetWriteBuf(wxi->LastRead());
         wxi->Read(s->GetWriteBuf(size+1), size);
         s->UngetWriteBuf(wxi->LastRead());

-        wxPy_END_ALLOW_THREADS;

 
         // error check
         if (wxi->LastError() == wxSTREAM_READ_ERROR) {
 
         // error check
         if (wxi->LastError() == wxSTREAM_READ_ERROR) {


@@ -214,11 +195,9 @@ wxString* wxPyInputStream::readline (int size) {
     }
 
     // read until \n or byte limit reached
     }
 
     // read until \n or byte limit reached

-    wxPy_BEGIN_ALLOW_THREADS;

     for (i=ch=0; (ch != '\n') && (!wxi->Eof()) && ((size < 0) || (i < size)); i++) {
         *s += ch = wxi->GetC();
     }
     for (i=ch=0; (ch != '\n') && (!wxi->Eof()) && ((size < 0) || (i < size)); i++) {
         *s += ch = wxi->GetC();
     }

-    wxPy_END_ALLOW_THREADS;

 
     // errorcheck
     if (wxi->LastError() == wxSTREAM_READ_ERROR) {
 
     // errorcheck
     if (wxi->LastError() == wxSTREAM_READ_ERROR) {


@@ -245,7 +224,6 @@ wxStringPtrList* wxPyInputStream::readlines (int sizehint) {
     }
 
     // read sizehint bytes or until EOF
     }
 
     // read sizehint bytes or until EOF

-    wxPy_BEGIN_ALLOW_THREADS;

     int i;
     for (i=0; (!wxi->Eof()) && ((sizehint < 0) || (i < sizehint));) {
         wxString* s = readline();
     int i;
     for (i=0; (!wxi->Eof()) && ((sizehint < 0) || (i < sizehint));) {
         wxString* s = readline();


@@ -257,7 +235,6 @@ wxStringPtrList* wxPyInputStream::readlines (int sizehint) {
         l->Append(s);
         i = i + s->Length();
     }
         l->Append(s);
         i = i + s->Length();
     }

-    wxPy_END_ALLOW_THREADS;

 
     // error check
     if (wxi->LastError() == wxSTREAM_READ_ERROR) {
 
     // error check
     if (wxi->LastError() == wxSTREAM_READ_ERROR) {


@@ -294,7 +271,7 @@ protected:
         if (bufsize == 0)
             return 0;
 
         if (bufsize == 0)
             return 0;
 

-        bool doSave = wxPyRestoreThread();
+        wxPyBeginBlockThreads();

         PyObject* arglist = Py_BuildValue("(i)", bufsize);
         PyObject* result = PyEval_CallObject(read, arglist);
         Py_DECREF(arglist);
         PyObject* arglist = Py_BuildValue("(i)", bufsize);
         PyObject* result = PyEval_CallObject(read, arglist);
         Py_DECREF(arglist);


@@ -312,7 +289,7 @@ protected:
         }
         else
             m_lasterror = wxSTREAM_READ_ERROR;
         }
         else
             m_lasterror = wxSTREAM_READ_ERROR;

-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();

         m_lastcount = o;
         return o;
     }
         m_lastcount = o;
         return o;
     }


@@ -323,17 +300,17 @@ protected:
     }
 
     virtual off_t OnSysSeek(off_t off, wxSeekMode mode){
     }
 
     virtual off_t OnSysSeek(off_t off, wxSeekMode mode){

-        bool doSave = wxPyRestoreThread();
+        wxPyBeginBlockThreads();

         PyObject*arglist = Py_BuildValue("(ii)", off, mode);
         PyObject*result = PyEval_CallObject(seek, arglist);
         Py_DECREF(arglist);
         Py_XDECREF(result);
         PyObject*arglist = Py_BuildValue("(ii)", off, mode);
         PyObject*result = PyEval_CallObject(seek, arglist);
         Py_DECREF(arglist);
         Py_XDECREF(result);

-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();

         return OnSysTell();
     }
 
     virtual off_t OnSysTell() const{
         return OnSysTell();
     }
 
     virtual off_t OnSysTell() const{

-        bool doSave = wxPyRestoreThread();
+        wxPyBeginBlockThreads();

         PyObject* arglist = Py_BuildValue("()");
         PyObject* result = PyEval_CallObject(tell, arglist);
         Py_DECREF(arglist);
         PyObject* arglist = Py_BuildValue("()");
         PyObject* result = PyEval_CallObject(tell, arglist);
         Py_DECREF(arglist);


@@ -342,7 +319,7 @@ protected:
             o = PyInt_AsLong(result);
             Py_DECREF(result);
         };
             o = PyInt_AsLong(result);
             Py_DECREF(result);
         };

-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();

         return o;
     }
 
         return o;
     }
 


@@ -352,12 +329,12 @@ protected:
 
 public:
     ~wxPyCBInputStream() {
 
 public:
     ~wxPyCBInputStream() {

-        bool doSave = wxPyRestoreThread();
+        wxPyBeginBlockThreads();

         Py_XDECREF(py);
         Py_XDECREF(read);
         Py_XDECREF(seek);
         Py_XDECREF(tell);
         Py_XDECREF(py);
         Py_XDECREF(read);
         Py_XDECREF(seek);
         Py_XDECREF(tell);

-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads();

     }
 
     virtual size_t GetSize() {
     }
 
     virtual size_t GetSize() {


@@ -428,6 +405,7 @@ static PyObject *_wrap_new_wxInputStream(PyObject *self, PyObject *args, PyObjec
     PyObject * _arg0;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "p", NULL };
     PyObject * _arg0;
     PyObject * _obj0 = 0;
     char *_kwnames[] = { "p", NULL };

+    char _ptemp[128];

 
     self = self;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxInputStream",_kwnames,&_obj0)) 
 
     self = self;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxInputStream",_kwnames,&_obj0)) 


@@ -436,17 +414,18 @@ static PyObject *_wrap_new_wxInputStream(PyObject *self, PyObject *args, PyObjec
   _arg0 = _obj0;
 }
 {
   _arg0 = _obj0;
 }
 {

+    PyThreadState* __tstate = wxPyBeginAllowThreads();

         _result = (wxPyInputStream *)new_wxPyInputStream(_arg0);
 
         _result = (wxPyInputStream *)new_wxPyInputStream(_arg0);
 

-}{
-    char _ptemp[128];
-    if (_result) {
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    if (_result) {

         SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyInputStream_p");
         _resultobj = Py_BuildValue("s",_ptemp);
         SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyInputStream_p");
         _resultobj = Py_BuildValue("s",_ptemp);

+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;

     }
     }

-    else
-        _resultobj=0;
-}

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -468,8 +447,11 @@ static PyObject *_wrap_wxInputStream_close(PyObject *self, PyObject *args, PyObj
         }
     }
 {
         }
     }
 {

+    PyThreadState* __tstate = wxPyBeginAllowThreads();

         wxInputStream_close(_arg0);
 
         wxInputStream_close(_arg0);
 

+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;

 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;


@@ -493,8 +475,11 @@ static PyObject *_wrap_wxInputStream_flush(PyObject *self, PyObject *args, PyObj
         }
     }
 {
         }
     }
 {

+    PyThreadState* __tstate = wxPyBeginAllowThreads();

         wxInputStream_flush(_arg0);
 
         wxInputStream_flush(_arg0);
 

+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;

 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;


@@ -519,8 +504,11 @@ static PyObject *_wrap_wxInputStream_eof(PyObject *self, PyObject *args, PyObjec
         }
     }
 {
         }
     }
 {

+    PyThreadState* __tstate = wxPyBeginAllowThreads();

         _result = (bool )wxInputStream_eof(_arg0);
 
         _result = (bool )wxInputStream_eof(_arg0);
 

+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;

 }    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 }    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }


@@ -545,15 +533,13 @@ static PyObject *_wrap_wxInputStream_read(PyObject *self, PyObject *args, PyObje
         }
     }
 {
         }
     }
 {

+    PyThreadState* __tstate = wxPyBeginAllowThreads();

         _result = (wxString *)wxInputStream_read(_arg0,_arg1);
 
         _result = (wxString *)wxInputStream_read(_arg0,_arg1);
 

+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;

 }{
 }{

-    if (_result) {
-        _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
-        delete _result;
-    }
-    else
-        _resultobj=0;
+    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());

 }
     return _resultobj;
 }
 }
     return _resultobj;
 }


@@ -578,15 +564,13 @@ static PyObject *_wrap_wxInputStream_readline(PyObject *self, PyObject *args, Py
         }
     }
 {
         }
     }
 {

+    PyThreadState* __tstate = wxPyBeginAllowThreads();

         _result = (wxString *)wxInputStream_readline(_arg0,_arg1);
 
         _result = (wxString *)wxInputStream_readline(_arg0,_arg1);
 

+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;

 }{
 }{

-    if (_result) {
-        _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
-        delete _result;
-    }
-    else
-        _resultobj=0;
+    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());

 }
     return _resultobj;
 }
 }
     return _resultobj;
 }


@@ -611,8 +595,11 @@ static PyObject *_wrap_wxInputStream_readlines(PyObject *self, PyObject *args, P
         }
     }
 {
         }
     }
 {

+    PyThreadState* __tstate = wxPyBeginAllowThreads();

         _result = (wxStringPtrList *)wxInputStream_readlines(_arg0,_arg1);
 
         _result = (wxStringPtrList *)wxInputStream_readlines(_arg0,_arg1);
 

+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;

 }{
     if (_result) {
         _resultobj = PyList_New(_result->GetCount());
 }{
     if (_result) {
         _resultobj = PyList_New(_result->GetCount());


@@ -651,8 +638,11 @@ static PyObject *_wrap_wxInputStream_seek(PyObject *self, PyObject *args, PyObje
         }
     }
 {
         }
     }
 {

+    PyThreadState* __tstate = wxPyBeginAllowThreads();

         wxInputStream_seek(_arg0,_arg1,_arg2);
 
         wxInputStream_seek(_arg0,_arg1,_arg2);
 

+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;

 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;


@@ -677,8 +667,11 @@ static PyObject *_wrap_wxInputStream_tell(PyObject *self, PyObject *args, PyObje
         }
     }
 {
         }
     }
 {

+    PyThreadState* __tstate = wxPyBeginAllowThreads();

         _result = (int )wxInputStream_tell(_arg0);
 
         _result = (int )wxInputStream_tell(_arg0);
 

+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;

 }    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }
 }    _resultobj = Py_BuildValue("i",_result);
     return _resultobj;
 }


@@ -708,7 +701,7 @@ static PyObject *_wrap_wxOutputStream_write(PyObject *self, PyObject *args, PyOb
 #if PYTHON_API_VERSION >= 1009
     char* tmpPtr; int tmpSize;
     if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
 #if PYTHON_API_VERSION >= 1009
     char* tmpPtr; int tmpSize;
     if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {

-        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);

         return NULL;
     }
     if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
         return NULL;
     }
     if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)


@@ -723,8 +716,11 @@ static PyObject *_wrap_wxOutputStream_write(PyObject *self, PyObject *args, PyOb
 #endif
 }
 {
 #endif
 }
 {

+    PyThreadState* __tstate = wxPyBeginAllowThreads();

         wxOutputStream_write(_arg0,*_arg1);
 
         wxOutputStream_write(_arg0,*_arg1);
 

+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;

 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
 }    Py_INCREF(Py_None);
     _resultobj = Py_None;
 {


@@ -789,8 +785,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_EBool","_int",0},
     { "_EBool","_wxWindowID",0},
     { "_unsigned_long","_long",0},
     { "_EBool","_int",0},
     { "_EBool","_wxWindowID",0},
     { "_unsigned_long","_long",0},

-    { "_wxPyInputStream","_class_wxPyInputStream",0},
-    { "_class_wxOutputStream","_wxOutputStream",0},

     { "_signed_int","_wxCoord",0},
     { "_signed_int","_wxPrintQuality",0},
     { "_signed_int","_EBool",0},
     { "_signed_int","_wxCoord",0},
     { "_signed_int","_wxPrintQuality",0},
     { "_signed_int","_EBool",0},


@@ -801,7 +795,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_WXTYPE","_unsigned_short",0},
     { "_unsigned_short","_WXTYPE",0},
     { "_unsigned_short","_short",0},
     { "_WXTYPE","_unsigned_short",0},
     { "_unsigned_short","_WXTYPE",0},
     { "_unsigned_short","_short",0},

-    { "_class_wxPyInputStream","_wxPyInputStream",0},

     { "_signed_short","_WXTYPE",0},
     { "_signed_short","_short",0},
     { "_unsigned_char","_byte",0},
     { "_signed_short","_WXTYPE",0},
     { "_signed_short","_short",0},
     { "_unsigned_char","_byte",0},


@@ -849,7 +842,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxCoord","_size_t",0},
     { "_wxCoord","_time_t",0},
     { "_wxCoord","_wxPrintQuality",0},
     { "_wxCoord","_size_t",0},
     { "_wxCoord","_time_t",0},
     { "_wxCoord","_wxPrintQuality",0},

-    { "_wxOutputStream","_class_wxOutputStream",0},

 {0,0,0}};
 
 static PyObject *SWIG_globals;
 {0,0,0}};
 
 static PyObject *SWIG_globals;


@@ -861,6 +853,8 @@ SWIGEXPORT(void) initstreamsc() {
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("streamsc", streamscMethods);
         d = PyModule_GetDict(m);
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("streamsc", streamscMethods);
         d = PyModule_GetDict(m);

+
+    wxPyPtrTypeMap_Add("wxInputStream", "wxPyInputStream");

 {
    int i;
    for (i = 0; _swig_mapping[i].n1; i++)
 {
    int i;
    for (i = 0; _swig_mapping[i].n1; i++)