paint full bitmap on Mac OS, as dc.SetLogicalFunction(wx.INvERT) does not work

DietmarSchwertberger · DietmarSchwertberger · commit 0cbd176ff63a · 2018-01-09T22:50:24.000+01:00
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1819,35 +1819,42 @@ def remove_rubberband(self):
 
 else:
     # on Mac OS retina displays DCOverlay does not work
+    # and dc.SetLogicalFunction does not have an effect on any display
+    # the workaround is to blit the full image for remove_rubberband
     class RubberbandWx(backend_tools.RubberbandBase):
         def __init__(self, *args, **kwargs):
             backend_tools.RubberbandBase.__init__(self, *args, **kwargs)
             self._rect = None
 
-        def remove_rubberband(self):
-            self.draw_rubberband(None,None,None,None,False)
-
-        def draw_rubberband(self, x0, y0, x1, y1, draw_new=True):
-
+        def draw_rubberband(self, x0, y0, x1, y1):
             dc = wx.ClientDC(self.canvas)
             # this would be required if the Canvas is a ScrolledWindow,
             # which is not the case for now
-            # self.PrepareDC(_dc)
-
+            # self.PrepareDC(dc)
+    
+            # delete old rubberband
+            if self._rect: self.remove_rubberband(dc)
+    
+            # draw new rubberband
             dc.SetPen(wx.Pen(wx.BLACK, 1, wx.SOLID)) 
-            dc.SetLogicalFunction(wx.INVERT)
             dc.SetBrush(wx.TRANSPARENT_BRUSH)
-
-            if self._rect:
-                dc.DrawRectangle(self._rect)
-    
-            if draw_new:
-                self._rect = (x0,self.canvas._height-y0, x1-x0, -y1+y0)
+            self._rect = (x0,self.canvas._height-y0, x1-x0, -y1+y0)
+            if wxc.is_phoenix:
                 dc.DrawRectangle(self._rect)
             else:
-                self._rect = None
-
-            dc.SetLogicalFunction(wx.COPY)
+                dc.DrawRectangleRect(self._rect)
+
+        def remove_rubberband(self, dc=None):
+            if not self._rect: return
+            if self.canvas.bitmap:
+                if dc is None:
+                    dc = wx.ClientDC(self.canvas)
+                dc.DrawBitmap(self.canvas.bitmap, 0, 0)
+                # for testing the method on Windows, use this code instead:
+                #img = self.canvas.bitmap.ConvertToImage()
+                #bmp = img.ConvertToBitmap()
+                #dc.DrawBitmap(bmp, 0, 0)
+            self._rect = None
 
 
 backend_tools.ToolSaveFigure = SaveFigureWx
