Rename/remove _lastCursor, as needed.

anntzer · anntzer · commit b9f94bd985e8 · 2021-11-10T11:34:18.000+01:00
UnCamelCase it in NavigationToolbar2.  Remove it from
FigureCanvasGTK{3,4} (it is now never accessed via the canvas, only via
the toolbar; this likely goes back to the original (pre-NT2) toolbar
design.
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2929,7 +2929,7 @@ def __init__(self, canvas):
         canvas.toolbar = self
         self._nav_stack = cbook.Stack()
         # This cursor will be set after the initial draw.
-        self._lastCursor = tools.Cursors.POINTER
+        self._last_cursor = tools.Cursors.POINTER
 
         self._id_press = self.canvas.mpl_connect(
             'button_press_event', self._zoom_pan_handler)
@@ -2998,16 +2998,16 @@ def _update_cursor(self, event):
         """
         if self.mode and event.inaxes and event.inaxes.get_navigate():
             if (self.mode == _Mode.ZOOM
-                    and self._lastCursor != tools.Cursors.SELECT_REGION):
+                    and self._last_cursor != tools.Cursors.SELECT_REGION):
                 self.canvas.set_cursor(tools.Cursors.SELECT_REGION)
-                self._lastCursor = tools.Cursors.SELECT_REGION
+                self._last_cursor = tools.Cursors.SELECT_REGION
             elif (self.mode == _Mode.PAN
-                  and self._lastCursor != tools.Cursors.MOVE):
+                  and self._last_cursor != tools.Cursors.MOVE):
                 self.canvas.set_cursor(tools.Cursors.MOVE)
-                self._lastCursor = tools.Cursors.MOVE
-        elif self._lastCursor != tools.Cursors.POINTER:
+                self._last_cursor = tools.Cursors.MOVE
+        elif self._last_cursor != tools.Cursors.POINTER:
             self.canvas.set_cursor(tools.Cursors.POINTER)
-            self._lastCursor = tools.Cursors.POINTER
+            self._last_cursor = tools.Cursors.POINTER
 
     @contextmanager
     def _wait_cursor_for_draw_cm(self):
@@ -3027,7 +3027,7 @@ def _wait_cursor_for_draw_cm(self):
                 self.canvas.set_cursor(tools.Cursors.WAIT)
                 yield
             finally:
-                self.canvas.set_cursor(self._lastCursor)
+                self.canvas.set_cursor(self._last_cursor)
         else:
             yield
 
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -100,7 +100,6 @@ def __init__(self, figure=None):
         GObject.GObject.__init__(self)
 
         self._idle_draw_id = 0
-        self._lastCursor = None
         self._rubberband_rect = None
 
         self.connect('scroll_event',         self.scroll_event)
diff --git a/lib/matplotlib/backends/backend_gtk4.py b/lib/matplotlib/backends/backend_gtk4.py
@@ -62,7 +62,6 @@ def __init__(self, figure=None):
         self.set_vexpand(True)
 
         self._idle_draw_id = 0
-        self._lastCursor = None
         self._rubberband_rect = None
 
         self.set_draw_func(self._draw_func)
