Add some missing wxPyBeginBlockThreads calls

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_config.i b/wxPython/src/_config.i
index 434b42cdb11896eff52e9480b78cf9c42128929e..1c8b100ff3c3357d6cca9bd8f22e92ef7d640721 100644 (file)
--- a/wxPython/src/_config.i
+++ b/wxPython/src/_config.i
@@ -24,12 +24,14 @@
 
 %{
     static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {
 
 %{
     static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {

+        wxPyBlock_t blocked = wxPyBeginBlockThreads();

         PyObject* ret = PyTuple_New(3);
         if (ret) {
             PyTuple_SET_ITEM(ret, 0, PyInt_FromLong(flag));
            PyTuple_SET_ITEM(ret, 1, wx2PyString(str));
             PyTuple_SET_ITEM(ret, 2, PyInt_FromLong(index));
         }
         PyObject* ret = PyTuple_New(3);
         if (ret) {
             PyTuple_SET_ITEM(ret, 0, PyInt_FromLong(flag));
            PyTuple_SET_ITEM(ret, 1, wx2PyString(str));
             PyTuple_SET_ITEM(ret, 2, PyInt_FromLong(index));
         }

+        wxPyEndBlockThreads(blocked);

         return ret;
     }
 %}
         return ret;
     }
 %}

diff --git a/wxPython/src/_font.i b/wxPython/src/_font.i
index 0e1922ad52c8bec8f215849c71a39f0eed14ad2c..0e3fc5ba79da4402fb75a93c293a0d26f3a546d0 100644 (file)
--- a/wxPython/src/_font.i
+++ b/wxPython/src/_font.i
@@ -842,19 +842,27 @@ public:
     //wxArrayString* GetFacenames();
     %extend {
         PyObject* GetEncodings() {
     //wxArrayString* GetFacenames();
     %extend {
         PyObject* GetEncodings() {

+            PyObject* ret;

             wxArrayString* arr = self->GetEncodings();
             wxArrayString* arr = self->GetEncodings();

+            wxPyBlock_t blocked = wxPyBeginBlockThreads();            

             if (arr)
             if (arr)

-                return wxArrayString2PyList_helper(*arr);
+                ret = wxArrayString2PyList_helper(*arr);

             else
             else

-                return PyList_New(0);
+                ret = PyList_New(0);
+            wxPyEndBlockThreads(blocked);
+            return ret;

         }
 
         PyObject* GetFacenames() {
         }
 
         PyObject* GetFacenames() {

+            PyObject* ret;

             wxArrayString* arr = self->GetFacenames();
             wxArrayString* arr = self->GetFacenames();

+            wxPyBlock_t blocked = wxPyBeginBlockThreads();            

             if (arr)
             if (arr)

-                return wxArrayString2PyList_helper(*arr);
+                ret = wxArrayString2PyList_helper(*arr);

             else
             else

-                return PyList_New(0);
+                ret =  PyList_New(0);
+            wxPyEndBlockThreads(blocked);
+            return ret;

         }
     }
 };
         }
     }
 };