Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-04 19:10:09 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore GIL acquisition in wxPseudoDC::FindObjects*

Browse Source 
(cherry picked from commit 5cace47aae)
This commit is contained in:
Robin Dunn
2020-11-18 10:52:53 -08:00
committed by Scott Talbert
parent 6489bd907c
commit b6883ef19c
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

@@ -482,7 +482,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;
@@ -500,7 +500,6 @@ PyObject *wxPseudoDC::FindObjectsByBBox(wxCoord x, wxCoord y)
}
pt = pt->GetNext();
}
//wxPyEndBlockThreads(blocked);
return pyList;
}
@@ -510,7 +509,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;
@@ -610,8 +609,7 @@ PyObject *wxPseudoDC::FindObjects(wxCoord x, wxCoord y,
maskdc.SelectObject(wxNullBitmap);
memdc.SelectObject(wxNullBitmap);
}
//wxPyEndBlockThreads(blocked);
return pyList;
return pyList;
}
// ----------------------------------------------------------------------------