cleaning navigation and toolbar dependencies

Author: fariza

lib/matplotlib/backend_bases.py

@@ -3263,9 +3263,8 @@ class NavigationBase(object):
     messagelock: `LockDraw` to know if the message is available to write
     """
 
-    def __init__(self, manager):
-        self.manager = manager
-        self.canvas = manager.canvas
+    def __init__(self, canvas):
+        self.canvas = canvas
 
         self._key_press_handler_id = self.canvas.mpl_connect(
             'key_press_event', self._key_press)
@@ -3599,9 +3598,8 @@ class ToolbarBase(object):
         this `Toolbar` wants to communicate with
     """
 
-    def __init__(self, manager):
-        self.manager = manager
-        self.navigation = manager.navigation
+    def __init__(self, navigation):
+        self.navigation = navigation
 
         self.navigation.nav_connect('tool_message_event', self._message_cbk)
         self.navigation.nav_connect('tool_added_event', self._add_tool_cbk)

lib/matplotlib/backends/backend_gtk3.py

@@ -483,15 +483,15 @@ def _get_toolbar(self):
         if rcParams['toolbar'] == 'toolbar2':
             toolbar = NavigationToolbar2GTK3 (self.canvas, self.window)
         elif rcParams['toolbar'] == 'navigation':
-            toolbar = ToolbarGTK3(self)
+            toolbar = ToolbarGTK3(self.navigation)
         else:
             toolbar = None
         return toolbar
 
     def _get_navigation(self):
         # must be initialised after toolbar has been setted
         if rcParams['toolbar'] != 'toolbar2':
-            navigation = NavigationGTK3(self)
+            navigation = NavigationGTK3(self.canvas)
         else:
             navigation = None
         return navigation
@@ -756,8 +756,8 @@ def draw_rubberband(self, x0, y0, x1, y1):
 
 
 class ToolbarGTK3(ToolbarBase, Gtk.Box):
-    def __init__(self, manager):
-        ToolbarBase.__init__(self, manager)
+    def __init__(self, navigation):
+        ToolbarBase.__init__(self, navigation)
         Gtk.Box.__init__(self)
         self.set_property("orientation", Gtk.Orientation.VERTICAL)