Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit bd015d0

Browse filesBrowse files
DietmarSchwertbergerDietmarSchwertberger
authored
Merge pull request #10518 from DietmarSchwertberger/wx-inconsistencies
Fix Wx inconsistencies
2 parents 149ee00 + 9d369a1 commit bd015d0
Copy full SHA for bd015d0

File tree

Expand file treeCollapse file tree

8 files changed

+29
-31
lines changed
Filter options
Expand file treeCollapse file tree

8 files changed

+29
-31
lines changed

‎examples/user_interfaces/embedding_in_wx2_sgskip.py

Copy file name to clipboardExpand all lines: examples/user_interfaces/embedding_in_wx2_sgskip.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"""
99

1010
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
11-
from matplotlib.backends.backend_wx import NavigationToolbar2Wx
11+
from matplotlib.backends.backend_wx import NavigationToolbar2Wx as NavigationToolbar
1212
from matplotlib.figure import Figure
1313

1414
import numpy as np
@@ -38,7 +38,7 @@ def __init__(self):
3838
self.add_toolbar() # comment this out for no toolbar
3939

4040
def add_toolbar(self):
41-
self.toolbar = NavigationToolbar2Wx(self.canvas)
41+
self.toolbar = NavigationToolbar(self.canvas)
4242
self.toolbar.Realize()
4343
# By adding toolbar in sizer, we are able to put it at the bottom
4444
# of the frame - so appearance is closer to GTK version.

‎examples/user_interfaces/embedding_in_wx3_sgskip.py

Copy file name to clipboardExpand all lines: examples/user_interfaces/embedding_in_wx3_sgskip.py
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
import matplotlib
3030
import matplotlib.cm as cm
3131
import matplotlib.cbook as cbook
32-
from matplotlib.backends.backend_wxagg import Toolbar, FigureCanvasWxAgg
32+
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
33+
from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as NavigationToolbar
3334
from matplotlib.figure import Figure
3435
import numpy as np
3536

@@ -47,8 +48,8 @@ def __init__(self, parent):
4748
wx.Panel.__init__(self, parent, -1)
4849

4950
self.fig = Figure((5, 4), 75)
50-
self.canvas = FigureCanvasWxAgg(self, -1, self.fig)
51-
self.toolbar = Toolbar(self.canvas) # matplotlib toolbar
51+
self.canvas = FigureCanvas(self, -1, self.fig)
52+
self.toolbar = NavigationToolbar(self.canvas) # matplotlib toolbar
5253
self.toolbar.Realize()
5354
# self.toolbar.set_active([0,1])
5455

‎examples/user_interfaces/embedding_in_wx4_sgskip.py

Copy file name to clipboardExpand all lines: examples/user_interfaces/embedding_in_wx4_sgskip.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"""
88

99
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
10-
from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg
10+
from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as NavigationToolbar
1111
from matplotlib.backends.backend_wx import _load_bitmap
1212
from matplotlib.figure import Figure
1313

@@ -16,14 +16,14 @@
1616
import wx
1717

1818

19-
class MyNavigationToolbar(NavigationToolbar2WxAgg):
19+
class MyNavigationToolbar(NavigationToolbar):
2020
"""
2121
Extend the default wx toolbar with your own event handlers
2222
"""
2323
ON_CUSTOM = wx.NewId()
2424

2525
def __init__(self, canvas, cankill):
26-
NavigationToolbar2WxAgg.__init__(self, canvas)
26+
NavigationToolbar.__init__(self, canvas)
2727

2828
# for simplicity I'm going to reuse a bitmap from wx, you'll
2929
# probably want to add your own.

‎examples/user_interfaces/embedding_in_wx5_sgskip.py

Copy file name to clipboardExpand all lines: examples/user_interfaces/embedding_in_wx5_sgskip.py
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
import wx.aui as aui
1515

1616
import matplotlib as mpl
17-
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas
18-
from matplotlib.backends.backend_wxagg import NavigationToolbar2Wx as Toolbar
17+
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
18+
from matplotlib.backends.backend_wxagg import NavigationToolbar2WxAgg as NavigationToolbar
1919

2020

2121
class Plot(wx.Panel):
2222
def __init__(self, parent, id=-1, dpi=None, **kwargs):
2323
wx.Panel.__init__(self, parent, id=id, **kwargs)
2424
self.figure = mpl.figure.Figure(dpi=dpi, figsize=(2, 2))
25-
self.canvas = Canvas(self, -1, self.figure)
26-
self.toolbar = Toolbar(self.canvas)
25+
self.canvas = FigureCanvas(self, -1, self.figure)
26+
self.toolbar = NavigationToolbar(self.canvas)
2727
self.toolbar.Realize()
2828

2929
sizer = wx.BoxSizer(wx.VERTICAL)

‎examples/user_interfaces/fourier_demo_wx_sgskip.py

Copy file name to clipboardExpand all lines: examples/user_interfaces/fourier_demo_wx_sgskip.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import numpy as np
99

1010
import wx
11-
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg
11+
from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
1212
from matplotlib.figure import Figure
1313

1414

@@ -123,7 +123,7 @@ def __init__(self, *args, **kwargs):
123123
def createCanvas(self, parent):
124124
self.lines = []
125125
self.figure = Figure()
126-
self.canvas = FigureCanvasWxAgg(parent, -1, self.figure)
126+
self.canvas = FigureCanvas(parent, -1, self.figure)
127127
self.canvas.callbacks.connect('button_press_event', self.mouseDown)
128128
self.canvas.callbacks.connect('motion_notify_event', self.mouseMotion)
129129
self.canvas.callbacks.connect('button_release_event', self.mouseUp)

‎lib/matplotlib/backends/backend_wx.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_wx.py
+6-9Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,6 +1471,7 @@ def updateButtonText(self, lst):
14711471
}
14721472

14731473

1474+
@cbook.deprecated("2.2")
14741475
class SubplotToolWX(wx.Frame):
14751476
def __init__(self, targetfig):
14761477
wx.Frame.__init__(self, None, -1, "Configure subplots")
@@ -1696,6 +1697,11 @@ def set_history_buttons(self):
16961697
self.EnableTool(self.wx_ids['Forward'], can_forward)
16971698

16981699

1700+
@cbook.deprecated("2.2", alternative="NavigationToolbar2Wx")
1701+
class Toolbar(NavigationToolbar2Wx):
1702+
pass
1703+
1704+
16991705
class StatusBarWx(wx.StatusBar):
17001706
"""
17011707
A status bar is added to _FigureFrame to allow measurements and the
@@ -1953,15 +1959,6 @@ def OnPrintPage(self, page):
19531959
return True
19541960
# >
19551961

1956-
########################################################################
1957-
#
1958-
# Now just provide the standard names that backend.__init__ is expecting
1959-
#
1960-
########################################################################
1961-
1962-
1963-
Toolbar = NavigationToolbar2Wx
1964-
19651962

19661963
@_Backend.export
19671964
class _BackendWx(_Backend):

‎lib/matplotlib/backends/backend_wxagg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_wxagg.py
+6-7Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
import wx
77

88
import matplotlib
9-
from .. import cbook
9+
from matplotlib import cbook
1010
from . import wx_compat as wxc
1111
from .backend_agg import FigureCanvasAgg
1212
from .backend_wx import (
13-
_BackendWx, _FigureCanvasWxBase, FigureFrameWx, NavigationToolbar2Wx)
13+
_BackendWx, _FigureCanvasWxBase, FigureFrameWx,
14+
NavigationToolbar2Wx as NavigationToolbar2WxAgg)
1415

1516

1617
class FigureFrameWxAgg(FigureFrameWx):
@@ -71,15 +72,13 @@ def blit(self, bbox=None):
7172
filetypes = FigureCanvasAgg.filetypes
7273

7374

74-
@cbook.deprecated("2.2")
75-
class NavigationToolbar2WxAgg(NavigationToolbar2Wx):
76-
def get_canvas(self, frame, fig):
77-
return FigureCanvasWxAgg(frame, -1, fig)
75+
@cbook.deprecated("2.2", alternative="NavigationToolbar2WxAgg")
76+
class Toolbar(NavigationToolbar2WxAgg):
77+
pass
7878

7979

8080
# agg/wxPython image conversion functions (wxPython >= 2.8)
8181

82-
8382
def _convert_agg_to_wx_image(agg, bbox):
8483
"""
8584
Convert the region of the agg buffer bounded by bbox to a wx.Image. If

‎lib/matplotlib/backends/backend_wxcairo.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_wxcairo.py
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
from .backend_cairo import cairo, FigureCanvasCairo, RendererCairo
99
from .backend_wx import (
10-
_BackendWx, _FigureCanvasWxBase, FigureFrameWx, NavigationToolbar2Wx)
10+
_BackendWx, _FigureCanvasWxBase, FigureFrameWx,
11+
NavigationToolbar2Wx as NavigationToolbar2WxCairo)
1112
import wx.lib.wxcairo as wxcairo
1213

1314

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.