Moved default_tool initilisation to FigureManagerBase and cleaned.

OceanWolf · fariza · commit 67257e72f92a · 2015-04-07T15:12:21.000-04:00
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2595,6 +2595,11 @@ def __init__(self, canvas, num):
 
         """
 
+        self.toolbar = self._get_toolbar()
+        self.navigation = self._get_navigation()
+        if rcParams['toolbar'] == 'navigation':
+            self.navigation.add_tools(tools.tools)
+
     def show(self):
         """
         For GUI backends, show the figure window and redraw.
@@ -2642,6 +2647,11 @@ def set_window_title(self, title):
         """
         pass
 
+    def _get_toolbar(self):
+        return None
+
+    def _get_navigation(self):
+        return None
 
 cursors = tools.cursors
 
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -416,9 +416,6 @@ def __init__(self, canvas, num):
 
         self.vbox.pack_start(self.canvas, True, True, 0)
 
-        self.toolbar = self._get_toolbar()
-        self.navigation = self._get_navigation()
-
         # calculate size for window
         w = int (self.canvas.figure.bbox.width)
         h = int (self.canvas.figure.bbox.height)
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -525,11 +525,10 @@ class FigureManagerTkAgg(FigureManagerBase):
     window      : The tk.Window
     """
     def __init__(self, canvas, num, window):
-        FigureManagerBase.__init__(self, canvas, num)
         self.window = window
+        FigureManagerBase.__init__(self, canvas, num)
         self.window.withdraw()
         self.set_window_title("Figure %d" % num)
-        self.canvas = canvas
         self._num =  num
         if matplotlib.rcParams['toolbar']=='toolbar2':
             self.toolbar = NavigationToolbar2TkAgg( canvas, self.window )
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -31,7 +31,6 @@
 from matplotlib.cbook import _string_to_bool
 from matplotlib import docstring
 from matplotlib.backend_bases import FigureCanvasBase
-from matplotlib.backend_tools import tools as default_tools
 from matplotlib.figure import Figure, figaspect
 from matplotlib.gridspec import GridSpec
 from matplotlib.image import imread as _imread
@@ -434,9 +433,6 @@ def figure(num=None,  # autoincrement if None, else integer from 1-N
                                         FigureClass=FigureClass,
                                         **kwargs)
 
-        if rcParams['toolbar'] == 'navigation':
-            figManager.navigation.add_tools(default_tools)
-
         if figLabel:
             figManager.set_window_title(figLabel)
             figManager.canvas.figure.set_label(figLabel)
