Merge pull request matplotlib#10540 from matplotlib/auto-backport-of-pr-10429

dstansby · web-flow · commit 46585395901d · 2018-02-20T09:07:32.000Z
Backport PR matplotlib#10429 on branch v2.2.x
diff --git a/lib/matplotlib/backends/backend_wxcairo.py b/lib/matplotlib/backends/backend_wxcairo.py
@@ -8,7 +8,7 @@
 from .backend_cairo import cairo, FigureCanvasCairo, RendererCairo
 from .backend_wx import (
     _BackendWx, _FigureCanvasWxBase, FigureFrameWx, NavigationToolbar2Wx)
-from . import wx_compat as wxc
+import wx.lib.wxcairo as wxcairo
 
 
 class FigureFrameWxCairo(FigureFrameWx):
@@ -41,8 +41,7 @@ def draw(self, drawDC=None):
         self._renderer.set_ctx_from_surface(surface)
         self._renderer.set_width_height(width, height)
         self.figure.draw(self._renderer)
-        buf = surface.get_data()
-        self.bitmap = wxc.BitmapFromBuffer(width, height, buf)
+        self.bitmap = wxcairo.BitmapFromImageSurface(surface)
         self._isDrawn = True
         self.gui_repaint(drawDC=drawDC, origin='WXCairo')
 
