Unify wx toolbars.

anntzer · anntzer · commit 2bfcf5f9acde · 2017-12-29T16:01:28.000-08:00
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1490,7 +1490,7 @@ def __init__(self, canvas):
         self.retinaFix = 'wxMac' in wx.PlatformInfo
 
     def get_canvas(self, frame, fig):
-        return FigureCanvasWx(frame, -1, fig)
+        return type(self.canvas)(frame, -1, fig)
 
     def _init_toolbar(self):
         DEBUG_MSG("_init_toolbar", 1, self)
diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py
@@ -6,7 +6,7 @@
 import wx
 
 import matplotlib
-from . import wx_compat as wxc
+from . import cbook, wx_compat as wxc
 from .backend_agg import FigureCanvasAgg
 from .backend_wx import (
     _BackendWx, _FigureCanvasWxBase, FigureFrameWx, NavigationToolbar2Wx)
@@ -16,14 +16,6 @@ class FigureFrameWxAgg(FigureFrameWx):
     def get_canvas(self, fig):
         return FigureCanvasWxAgg(self, -1, fig)
 
-    def _get_toolbar(self, statbar):
-        if matplotlib.rcParams['toolbar'] == 'toolbar2':
-            toolbar = NavigationToolbar2WxAgg(self.canvas)
-            toolbar.set_status_bar(statbar)
-        else:
-            toolbar = None
-        return toolbar
-
 
 class FigureCanvasWxAgg(FigureCanvasAgg, _FigureCanvasWxBase):
     """
@@ -74,6 +66,7 @@ def blit(self, bbox=None):
         self.gui_repaint()
 
 
+@cbook.deprecated("2.2")
 class NavigationToolbar2WxAgg(NavigationToolbar2Wx):
     def get_canvas(self, frame, fig):
         return FigureCanvasWxAgg(frame, -1, fig)
