matplotlib.rcParams['toolbar'] == 'None' starts toolmanager but not toolbar

fariza · fariza · commit a88dc2d872f9 · 2015-04-07T12:12:55.000-04:00
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -431,12 +431,13 @@ def add_widget(child, expand, fill, padding):
             size_request = child.size_request()
             return size_request.height
 
-        if matplotlib.rcParams['toolbar'] == 'toolmanager':
+        if self.toolmanager:
             backend_tools.add_tools_to_manager(self.toolmanager)
-            backend_tools.add_tools_to_container(self.toolbar)
-            self.statusbar = StatusbarGTK3(self.toolmanager)
-            h += add_widget(self.statusbar, False, False, 0)
-            h += add_widget(Gtk.HSeparator(), False, False, 0)
+            if self.toolbar:
+                backend_tools.add_tools_to_container(self.toolbar)
+                self.statusbar = StatusbarGTK3(self.toolmanager)
+                h += add_widget(self.statusbar, False, False, 0)
+                h += add_widget(Gtk.HSeparator(), False, False, 0)
 
         if self.toolbar is not None:
             self.toolbar.show()
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -539,10 +539,11 @@ def __init__(self, canvas, num, window):
         self.toolbar = self._get_toolbar()
         self.statusbar = None
 
-        if matplotlib.rcParams['toolbar'] == 'toolmanager':
+        if self.toolmanager:
             backend_tools.add_tools_to_manager(self.toolmanager)
-            backend_tools.add_tools_to_container(self.toolbar)
-            self.statusbar = StatusbarTk(self.window, self.toolmanager)
+            if self.toolbar:
+                backend_tools.add_tools_to_container(self.toolbar)
+                self.statusbar = StatusbarTk(self.window, self.toolmanager)
 
         self._shown = False
 
