X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0122b7e3fcfd78f879470053c91a60e3c66537a3..8dba8632c5bcd64724e2e9e2d40e295555a0cb86:/wxPython/src/my_typemaps.i

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index 1ccbfe527c..d6b99441ef 100644
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -12,12 +12,12 @@
 
 
 //---------------------------------------------------------------------------
-// Tell SWIG to wrap all the wrappers with Python's thread macros
+// Tell SWIG to wrap all the wrappers with our thread protection
 
 %except(python) {
-    wxPy_BEGIN_ALLOW_THREADS;
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
     $function
-    wxPy_END_ALLOW_THREADS;
+    wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
 }
 
@@ -269,6 +269,29 @@
         return NULL;
 }
 
+//---------------------------------------------------------------------------
+// Typemap for wxArrayString from Python sequence objects
+
+%typemap(python,in) wxArrayString& {
+    if (! PySequence_Check($source)) {
+        PyErr_SetString(PyExc_TypeError, "Sequence of strings expected.");
+        return NULL;
+    }
+    $target = new wxArrayString;
+    int i, len=PySequence_Length($source);
+    for (i=0; i<len; i++) {
+        PyObject* item = PySequence_GetItem($source, i);
+        PyObject* str  = PyObject_Str(item);
+        $target->Add(PyString_AsString(item));
+        Py_DECREF(item);
+        Py_DECREF(str);
+    }
+}
+
+%typemap(python, freearg) wxArrayString& {
+    if ($target)
+        delete $source;
+}
 
 //---------------------------------------------------------------------------
 // Map T_OUTPUTs for floats to return ints.
@@ -308,7 +331,6 @@
 %typemap(python, out) wxMouseEvent*             { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxObject*                 { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxPyPrintout*             { $target = wxPyMake_wxObject($source); }
-%typemap(python, out) wxSizer*                  { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxToolBarToolBase*        { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxToolTip*                { $target = wxPyMake_wxObject($source); }
 
@@ -328,6 +350,8 @@
 %typemap(python, out) wxToolBarBase*            { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxWindow*                 { $target = wxPyMake_wxObject($source); }
 
+%typemap(python, out) wxSizer*                  { $target = wxPyMake_wxSizer($source); }
+
 
 //%typemap(python, out) wxHtmlCell*               { $target = wxPyMake_wxObject($source); }
 //%typemap(python, out) wxHtmlContainerCell*      { $target = wxPyMake_wxObject($source); }