From e6f85a8554aeaa47863ef5e17a38309794f91ef8 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 15 Apr 2006 04:29:30 +0000 Subject: [PATCH] Add some missing wxPyBeginBlockThreads calls git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/_config.i | 2 ++ wxPython/src/_font.i | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/wxPython/src/_config.i b/wxPython/src/_config.i index 434b42cdb1..1c8b100ff3 100644 --- a/wxPython/src/_config.i +++ b/wxPython/src/_config.i @@ -24,12 +24,14 @@ %{ 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)); } + wxPyEndBlockThreads(blocked); return ret; } %} diff --git a/wxPython/src/_font.i b/wxPython/src/_font.i index 0e1922ad52..0e3fc5ba79 100644 --- a/wxPython/src/_font.i +++ b/wxPython/src/_font.i @@ -842,19 +842,27 @@ public: //wxArrayString* GetFacenames(); %extend { PyObject* GetEncodings() { + PyObject* ret; wxArrayString* arr = self->GetEncodings(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (arr) - return wxArrayString2PyList_helper(*arr); + ret = wxArrayString2PyList_helper(*arr); else - return PyList_New(0); + ret = PyList_New(0); + wxPyEndBlockThreads(blocked); + return ret; } PyObject* GetFacenames() { + PyObject* ret; wxArrayString* arr = self->GetFacenames(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if (arr) - return wxArrayString2PyList_helper(*arr); + ret = wxArrayString2PyList_helper(*arr); else - return PyList_New(0); + ret = PyList_New(0); + wxPyEndBlockThreads(blocked); + return ret; } } }; -- 2.47.2