Avoid assert on wxMac

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

diff --git a/wxPython/src/pseudodc.cpp b/wxPython/src/pseudodc.cpp
index b904cef98d817294fc8fcb22b1c6a27e6285d09d..02788b1fb1df99d5952a2972b6e78d1735dc9803 100644 (file)
--- a/wxPython/src/pseudodc.cpp
+++ b/wxPython/src/pseudodc.cpp
@@ -561,8 +561,14 @@ PyObject *wxPseudoDC::FindObjects(wxCoord x, wxCoord y,
                 memdc.SetPen(bgpen);
                 memdc.DrawRectangle(viewrect);
                 memdc.SetLogicalFunction(wxCOPY);
                 memdc.SetPen(bgpen);
                 memdc.DrawRectangle(viewrect);
                 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
                 memdc.Blit(x-radius,y-radius,2*radius,2*radius,&maskdc,0,0,wxAND);
                 // AND with circle bitmap
                 memdc.Blit(x-radius,y-radius,2*radius,2*radius,&maskdc,0,0,wxAND);

+#endif

                 // clear and update rgn2
                 memdc.SelectObject(wxNullBitmap);
                 rgn2.Clear();
                 // clear and update rgn2
                 memdc.SelectObject(wxNullBitmap);
                 rgn2.Clear();