Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 09:40:07 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Restore GIL acquisition in wxPseudoDC::FindObjects*

Browse Source
This commit is contained in:
Robin Dunn
2020-11-18 10:52:53 -08:00
parent 6959fd7f98
commit 5cace47aae
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pseudodc.cpp
View File

@@ -483,7 +483,7 @@ bool wxPseudoDC::GetIdGreyedOut(int id)
// ----------------------------------------------------------------------------
PyObject *wxPseudoDC::FindObjectsByBBox(wxCoord x, wxCoord y)
{
//wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPyThreadBlocker blocker;
pdcObjectList::compatibility_iterator pt = m_objectlist.GetFirst();
pdcObject *obj;
PyObject* pyList = NULL;
@@ -501,7 +501,6 @@ PyObject *wxPseudoDC::FindObjectsByBBox(wxCoord x, wxCoord y)
}
pt = pt->GetNext();
}
//wxPyEndBlockThreads(blocked);
return pyList;
}
@@ -511,7 +510,7 @@ PyObject *wxPseudoDC::FindObjectsByBBox(wxCoord x, wxCoord y)
PyObject *wxPseudoDC::FindObjects(wxCoord x, wxCoord y,
wxCoord radius, const wxColor& bg)
{
//wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPyThreadBlocker blocker;
pdcObjectList::compatibility_iterator pt = m_objectlist.GetFirst();
pdcObject *obj;
PyObject* pyList = NULL;
@@ -611,8 +610,7 @@ PyObject *wxPseudoDC::FindObjects(wxCoord x, wxCoord y,
maskdc.SelectObject(wxNullBitmap);
memdc.SelectObject(wxNullBitmap);
}
//wxPyEndBlockThreads(blocked);
return pyList;
return pyList;
}
// ----------------------------------------------------------------------------