Avoid assert on wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -561,8 +561,14 @@ PyObject *wxPseudoDC::FindObjects(wxCoord x, wxCoord y,
|
|||||||
memdc.SetPen(bgpen);
|
memdc.SetPen(bgpen);
|
||||||
memdc.DrawRectangle(viewrect);
|
memdc.DrawRectangle(viewrect);
|
||||||
memdc.SetLogicalFunction(wxCOPY);
|
memdc.SetLogicalFunction(wxCOPY);
|
||||||
|
#ifdef __WXMAC__
|
||||||
|
// wxAND is not supported on wxMac, but it doesn't seem to
|
||||||
|
// hurt anything to use wxCOPY instead...
|
||||||
|
memdc.Blit(x-radius,y-radius,2*radius,2*radius,&maskdc,0,0,wxCOPY);
|
||||||
|
#else
|
||||||
// AND with circle bitmap
|
// AND with circle bitmap
|
||||||
memdc.Blit(x-radius,y-radius,2*radius,2*radius,&maskdc,0,0,wxAND);
|
memdc.Blit(x-radius,y-radius,2*radius,2*radius,&maskdc,0,0,wxAND);
|
||||||
|
#endif
|
||||||
// clear and update rgn2
|
// clear and update rgn2
|
||||||
memdc.SelectObject(wxNullBitmap);
|
memdc.SelectObject(wxNullBitmap);
|
||||||
rgn2.Clear();
|
rgn2.Clear();
|
||||||
|
Reference in New Issue
Block a user