Little tweaks to match CVS changes

[wxWidgets.git] / wxPython / src / _streams.i

diff --git a/wxPython/src/_streams.i b/wxPython/src/_streams.i
index d8d9f26094f814d95f3d25e77fedb5c98eaeea89..db75ebb98de77ecfa1370475ba12eff4d9438234 100644 (file)
--- a/wxPython/src/_streams.i
+++ b/wxPython/src/_streams.i
@@ -23,8 +23,15 @@
 %newgroup
 
 
 %newgroup
 
 

-// typemaps for wxInputStream
-%typemap(in) wxInputStream*  (wxPyInputStream* temp, bool created) {
+// Typemaps for wxInputStream
+//
+// We assume that input params taking a wxInputStream& will *not* take
+// ownership of the stream and so we manage it in the typemaps. On the other
+// hand, when a paramter expects a wxInputStream* then it does take ownership
+// (such as wxFSFile) and so the typemap will make a copy of the stream object
+// to give to it.
+ 
+%typemap(in) wxInputStream&  (wxPyInputStream* temp, bool created) {

     if (wxPyConvertSwigPtr($input, (void **)&temp, wxT("wxPyInputStream"))) {
         $1 = temp->m_wxis;
         created = false;
     if (wxPyConvertSwigPtr($input, (void **)&temp, wxT("wxPyInputStream"))) {
         $1 = temp->m_wxis;
         created = false;


@@ -32,20 +39,28 @@
         PyErr_Clear();  // clear the failure of the wxPyConvert above
         $1 = wxPyCBInputStream_create($input, false);
         if ($1 == NULL) {
         PyErr_Clear();  // clear the failure of the wxPyConvert above
         $1 = wxPyCBInputStream_create($input, false);
         if ($1 == NULL) {

-            PyErr_SetString(PyExc_TypeError, "Expected wxInputStream or Python file-like object.");
+            PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object.");

             SWIG_fail;
         }
         created = true;
     }
 }
             SWIG_fail;
         }
         created = true;
     }
 }

-%typemap(freearg) wxInputStream* {
-    if (created$argnum)
-        delete $1;
-}
+%typemap(freearg) wxInputStream& { if (created$argnum) delete $1; }
+

 
 

+%typemap(in) wxInputStream*  (wxPyInputStream* temp) {
+    if (wxPyConvertSwigPtr($input, (void **)&temp, wxT("wxPyInputStream"))) {
+        $1 = wxPyCBInputStream_copy((wxPyCBInputStream*)temp->m_wxis);
+    } else {
+        PyErr_Clear();  // clear the failure of the wxPyConvert above
+        $1 = wxPyCBInputStream_create($input, true);
+        if ($1 == NULL) {
+            PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object.");
+            SWIG_fail;
+        }
+    }
+}

 
 

-%typemap(in) wxInputStream&       = wxInputStream*;
-%typemap(freearg) wxInputStream&  = wxInputStream*;

 
 
 %typemap(out) wxInputStream* {
 
 
 %typemap(out) wxInputStream* {


@@ -68,7 +83,9 @@ enum wxSeekMode
 };
 
 
 };
 
 

-%name(InputStream) class wxPyInputStream {
+%rename(InputStream) wxPyInputStream;
+class wxPyInputStream
+{

 public:
     %extend {
         wxPyInputStream(PyObject* p) {
 public:
     %extend {
         wxPyInputStream(PyObject* p) {