Commitf11f7c9

committed

Unify wx toolbars.

1 parent27cc0a5 commitf11f7c9Copy full SHA for f11f7c9

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1504,7 +1504,7 @@ def __init__(self, canvas):`
`1504`	`1504`	`self.retinaFix='wxMac'inwx.PlatformInfo`
`1505`	`1505`
`1506`	`1506`	`defget_canvas(self,frame,fig):`
`1507`		`-returnFigureCanvasWx(frame,-1,fig)`
	`1507`	`+returntype(self.canvas)(frame,-1,fig)`
`1508`	`1508`
`1509`	`1509`	`def_init_toolbar(self):`
`1510`	`1510`	`DEBUG_MSG("_init_toolbar",1,self)`

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`importsix`
`5`	`5`
`6`	`6`	`importmatplotlib`
	`7`	`+frommatplotlibimportcbook`
`7`	`8`	`frommatplotlib.figureimportFigure`
`8`	`9`
`9`	`10`	`from .backend_aggimportFigureCanvasAgg`
`@@ -20,14 +21,6 @@ class FigureFrameWxAgg(FigureFrameWx):`
`20`	`21`	`defget_canvas(self,fig):`
`21`	`22`	`returnFigureCanvasWxAgg(self,-1,fig)`
`22`	`23`
`23`		`-def_get_toolbar(self,statbar):`
`24`		`-ifmatplotlib.rcParams['toolbar']=='toolbar2':`
`25`		`-toolbar=NavigationToolbar2WxAgg(self.canvas)`
`26`		`-toolbar.set_status_bar(statbar)`
`27`		`-else:`
`28`		`-toolbar=None`
`29`		`-returntoolbar`
`30`		`-`
`31`	`24`
`32`	`25`	`classFigureCanvasWxAgg(FigureCanvasAgg,_FigureCanvasWxBase):`
`33`	`26`	`"""`
`@@ -78,6 +71,7 @@ def blit(self, bbox=None):`
`78`	`71`	`self.gui_repaint()`
`79`	`72`
`80`	`73`
	`74`	`+@cbook.deprecated("2.2")`
`81`	`75`	`classNavigationToolbar2WxAgg(NavigationToolbar2Wx):`
`82`	`76`	`defget_canvas(self,frame,fig):`
`83`	`77`	`returnFigureCanvasWxAgg(frame,-1,fig)`

Comments

(0)