- make 'WX' and 'WXAgg' work with wxPython 2.8, 2.9, 3.0 and 3.0.2 Phoenix

wernerfb · wernerfb · commit 25798d5ff663 · 2014-10-01T13:28:29.000+02:00
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -428,6 +428,7 @@ def __init__(self, bitmap, renderer):
         GraphicsContextBase.__init__(self)
         #assert self.Ok(), "wxMemoryDC not OK to use"
         DEBUG_MSG("__init__()", 1, self)
+        DEBUG_MSG("__init__() 2: %s" % bitmap, 1, self)
 
         dc, gfx_ctx = self._cache.get(bitmap, (None, None))
         if dc is None:
@@ -695,7 +696,6 @@ def do_nothing(*args, **kwargs):
 
         self.Bind(wx.EVT_SIZE, self._onSize)
         self.Bind(wx.EVT_PAINT, self._onPaint)
-        self.Bind(wx.EVT_ERASE_BACKGROUND, self._onEraseBackground)
         self.Bind(wx.EVT_KEY_DOWN, self._onKeyDown)
         self.Bind(wx.EVT_KEY_UP, self._onKeyUp)
         self.Bind(wx.EVT_RIGHT_DOWN, self._onRightButtonDown)
@@ -714,7 +714,13 @@ def do_nothing(*args, **kwargs):
         self.Bind(wx.EVT_MIDDLE_DCLICK, self._onMiddleButtonDClick)
         self.Bind(wx.EVT_MIDDLE_UP, self._onMiddleButtonUp)
 
-        self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
+        if wx.VERSION_STRING < "2.9":
+            # only needed in 2.8 to reduce flicker
+            self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
+            self.Bind(wx.EVT_ERASE_BACKGROUND, self._onEraseBackground)
+        else:
+            # this does the same in 2.9+
+            self.SetBackgroundStyle(wx.BG_STYLE_PAINT)
 
         self.macros = {}  # dict from wx id to seq of macros
 
@@ -862,20 +868,31 @@ def _get_imagesave_wildcards(self):
         wildcards = '|'.join(wildcards)
         return wildcards, extensions, filter_index
 
-    def gui_repaint(self, drawDC=None):
+    def gui_repaint(self, drawDC=None, origin='WX'):
         """
         Performs update of the displayed image on the GUI canvas, using the
-        supplied device context.  If drawDC is None, a ClientDC will be used to
-        redraw the image.
+        supplied wx.PaintDC device context.
+
+        The 'WXAgg' backend sets origin accordingly.
         """
         DEBUG_MSG("gui_repaint()", 1, self)
         if self.IsShownOnScreen():
-            if drawDC is None:
+            if not drawDC:
+                # not called from OnPaint use a ClientDC
                 drawDC = wx.ClientDC(self)
 
-            drawDC.DrawBitmap(self.bitmap, 0, 0)
-        else:
-            pass
+            # ensure that canvas has no 'left' over stuff when resizing frame
+            drawDC.Clear()
+
+            # following is for 'WX' backend on Windows
+            # the bitmap can not be in use by another DC,
+            # see GraphicsContextWx._cache
+            if wx.Platform == '__WXMSW__' and origin == 'WX':
+                img = self.bitmap.ConvertToImage()
+                bmp = img.ConvertToBitmap()
+                drawDC.DrawBitmap(bmp, 0, 0)
+            else:
+                drawDC.DrawBitmap(self.bitmap, 0, 0)
 
     filetypes = FigureCanvasBase.filetypes.copy()
     filetypes['bmp'] = 'Windows bitmap'
diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py
@@ -52,7 +52,7 @@ def draw(self, drawDC=None):
 
         self.bitmap = _convert_agg_to_wx_bitmap(self.get_renderer(), None)
         self._isDrawn = True
-        self.gui_repaint(drawDC=drawDC)
+        self.gui_repaint(drawDC=drawDC, origin='WXAgg')
 
     def blit(self, bbox=None):
         """
