Merge pull request #7409 from OceanWolf/fix-tbar-None

NelleV · web-flow · commit ba019f7119dc · 2016-11-07T18:47:41.000-08:00
FIX: MPL should not use new tool manager unless explicited asked for. Closes #7404
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -495,7 +495,7 @@ def _get_toolbar(self):
 
     def _get_toolmanager(self):
         # must be initialised after toolbar has been setted
-        if rcParams['toolbar'] != 'toolbar2':
+        if rcParams['toolbar'] == 'toolmanager':
             toolmanager = ToolManager(self.canvas.figure)
         else:
             toolmanager = None
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -569,7 +569,7 @@ def _get_toolbar(self):
         return toolbar
 
     def _get_toolmanager(self):
-        if rcParams['toolbar'] != 'toolbar2':
+        if rcParams['toolbar'] == 'toolmanager':
             toolmanager = ToolManager(self.canvas.figure)
         else:
             toolmanager = None
