X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b37c7e1dcdad16c20d9800d2abaf53cc6b653a64..69d06d69ad5332eee01ce48f62092ff2b40982c3:/wxPython/src/my_typemaps.i

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index 6be6572f4c..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;
 }
 
@@ -331,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); }
 
@@ -351,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); }