diff --git a/examples/user_interfaces/embedding_in_wx2_sgskip.py b/examples/user_interfaces/embedding_in_wx2_sgskip.py index f83f2ec6e598..895627733f43 100644 --- a/examples/user_interfaces/embedding_in_wx2_sgskip.py +++ b/examples/user_interfaces/embedding_in_wx2_sgskip.py @@ -8,7 +8,7 @@ """ from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas -from matplotlib.backends.backend_wx import NavigationToolbar2Wx +from matplotlib.backends.backend_wx import NavigationToolbar2Wx as NavigationToolbar from matplotlib.figure import Figure import numpy as np @@ -38,7 +38,7 @@ def __init__(self): self.add_toolbar() # comment this out for no toolbar def add_toolbar(self): - self.toolbar = NavigationToolbar2Wx(self.canvas) + self.toolbar = NavigationToolbar(self.canvas) self.toolbar.Realize() # By adding toolbar in sizer, we are able to put it at the bottom # of the frame - so appearance is closer to GTK version. diff --git a/examples/user_interfaces/embedding_in_wx3_sgskip.py b/examples/user_interfaces/embedding_in_wx3_sgskip.py index 8ecce24d81bc..5a3d1a7aac85 100644 --- a/examples/user_interfaces/embedding_in_wx3_sgskip.py +++ b/examples/user_interfaces/embedding_in_wx3_sgskip.py @@ -29,7 +29,8 @@ import matplotlib import matplotlib.cm as cm import matplotlib.cbook as cbook -from matplotlib.backends.backend_wxagg import Toolbar, FigureCanvasWxAgg +from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas +from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as NavigationToolbar from matplotlib.figure import Figure import numpy as np @@ -47,8 +48,8 @@ def __init__(self, parent): wx.Panel.__init__(self, parent, -1) self.fig = Figure((5, 4), 75) - self.canvas = FigureCanvasWxAgg(self, -1, self.fig) - self.toolbar = Toolbar(self.canvas) # matplotlib toolbar + self.canvas = FigureCanvas(self, -1, self.fig) + self.toolbar = NavigationToolbar(self.canvas) # matplotlib toolbar self.toolbar.Realize() # self.toolbar.set_active([0,1]) diff --git a/examples/user_interfaces/embedding_in_wx4_sgskip.py b/examples/user_interfaces/embedding_in_wx4_sgskip.py index 25b0fdbfea81..a6b81f97681d 100644 --- a/examples/user_interfaces/embedding_in_wx4_sgskip.py +++ b/examples/user_interfaces/embedding_in_wx4_sgskip.py @@ -7,7 +7,7 @@ """ from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas -from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg +from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as NavigationToolbar from matplotlib.backends.backend_wx import _load_bitmap from matplotlib.figure import Figure @@ -16,14 +16,14 @@ import wx -class MyNavigationToolbar(NavigationToolbar2WxAgg): +class MyNavigationToolbar(NavigationToolbar): """ Extend the default wx toolbar with your own event handlers """ ON_CUSTOM = wx.NewId() def __init__(self, canvas, cankill): - NavigationToolbar2WxAgg.__init__(self, canvas) + NavigationToolbar.__init__(self, canvas) # for simplicity I'm going to reuse a bitmap from wx, you'll # probably want to add your own. diff --git a/examples/user_interfaces/embedding_in_wx5_sgskip.py b/examples/user_interfaces/embedding_in_wx5_sgskip.py index 6d3fb156cbac..61261cd1297d 100644 --- a/examples/user_interfaces/embedding_in_wx5_sgskip.py +++ b/examples/user_interfaces/embedding_in_wx5_sgskip.py @@ -14,16 +14,16 @@ import wx.aui as aui import matplotlib as mpl -from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas -from matplotlib.backends.backend_wxagg import NavigationToolbar2Wx as Toolbar +from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas +from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as NavigationToolbar class Plot(wx.Panel): def __init__(self, parent, id=-1, dpi=None, **kwargs): wx.Panel.__init__(self, parent, id=id, **kwargs) self.figure = mpl.figure.Figure(dpi=dpi, figsize=(2, 2)) - self.canvas = Canvas(self, -1, self.figure) - self.toolbar = Toolbar(self.canvas) + self.canvas = FigureCanvas(self, -1, self.figure) + self.toolbar = NavigationToolbar(self.canvas) self.toolbar.Realize() sizer = wx.BoxSizer(wx.VERTICAL) diff --git a/examples/user_interfaces/fourier_demo_wx_sgskip.py b/examples/user_interfaces/fourier_demo_wx_sgskip.py index 5a76d237b9e3..2a943f253a82 100644 --- a/examples/user_interfaces/fourier_demo_wx_sgskip.py +++ b/examples/user_interfaces/fourier_demo_wx_sgskip.py @@ -8,7 +8,7 @@ import numpy as np import wx -from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg +from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas from matplotlib.figure import Figure @@ -123,7 +123,7 @@ def __init__(self, *args, **kwargs): def createCanvas(self, parent): self.lines = [] self.figure = Figure() - self.canvas = FigureCanvasWxAgg(parent, -1, self.figure) + self.canvas = FigureCanvas(parent, -1, self.figure) self.canvas.callbacks.connect('button_press_event', self.mouseDown) self.canvas.callbacks.connect('motion_notify_event', self.mouseMotion) self.canvas.callbacks.connect('button_release_event', self.mouseUp) diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py index ad62b98cbde2..087130d06aee 100644 --- a/lib/matplotlib/backends/backend_wx.py +++ b/lib/matplotlib/backends/backend_wx.py @@ -1473,6 +1473,7 @@ def updateButtonText(self, lst): } +@cbook.deprecated("2.2") class SubplotToolWX(wx.Frame): def __init__(self, targetfig): wx.Frame.__init__(self, None, -1, "Configure subplots") @@ -1698,6 +1699,11 @@ def set_history_buttons(self): self.EnableTool(self.wx_ids['Forward'], can_forward) +@cbook.deprecated("2.2", alternative="NavigationToolbar2Wx") +class Toolbar(NavigationToolbar2Wx): + pass + + class StatusBarWx(wx.StatusBar): """ A status bar is added to _FigureFrame to allow measurements and the @@ -1955,15 +1961,6 @@ def OnPrintPage(self, page): return True # > -######################################################################## -# -# Now just provide the standard names that backend.__init__ is expecting -# -######################################################################## - - -Toolbar = NavigationToolbar2Wx - @_Backend.export class _BackendWx(_Backend): diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py index 14864b1e47c1..041f274a78b1 100644 --- a/lib/matplotlib/backends/backend_wxagg.py +++ b/lib/matplotlib/backends/backend_wxagg.py @@ -6,11 +6,12 @@ import wx import matplotlib -from .. import cbook +from matplotlib import cbook from . import wx_compat as wxc from .backend_agg import FigureCanvasAgg from .backend_wx import ( - _BackendWx, _FigureCanvasWxBase, FigureFrameWx, NavigationToolbar2Wx) + _BackendWx, _FigureCanvasWxBase, FigureFrameWx, + NavigationToolbar2Wx as NavigationToolbar2WxAgg) class FigureFrameWxAgg(FigureFrameWx): @@ -71,15 +72,13 @@ def blit(self, bbox=None): filetypes = FigureCanvasAgg.filetypes -@cbook.deprecated("2.2") -class NavigationToolbar2WxAgg(NavigationToolbar2Wx): - def get_canvas(self, frame, fig): - return FigureCanvasWxAgg(frame, -1, fig) +@cbook.deprecated("2.2", alternative="NavigationToolbar2WxAgg") +class Toolbar(NavigationToolbar2WxAgg): + pass # agg/wxPython image conversion functions (wxPython >= 2.8) - def _convert_agg_to_wx_image(agg, bbox): """ Convert the region of the agg buffer bounded by bbox to a wx.Image. If diff --git a/lib/matplotlib/backends/backend_wxcairo.py b/lib/matplotlib/backends/backend_wxcairo.py index 8bd71f5b8d4e..fb3290f2bbc4 100644 --- a/lib/matplotlib/backends/backend_wxcairo.py +++ b/lib/matplotlib/backends/backend_wxcairo.py @@ -7,7 +7,8 @@ from .backend_cairo import cairo, FigureCanvasCairo, RendererCairo from .backend_wx import ( - _BackendWx, _FigureCanvasWxBase, FigureFrameWx, NavigationToolbar2Wx) + _BackendWx, _FigureCanvasWxBase, FigureFrameWx, + NavigationToolbar2Wx as NavigationToolbar2WxCairo) import wx.lib.wxcairo as wxcairo