Merge pull request #10254 from anntzer/revert-cursor

jklymak · tacaswell · commit 9ca66ae52792 · 2018-01-16T23:18:43.000-05:00
Quick and dirty revert of busy cursor for 2.1.2.

Conflicts:
	lib/matplotlib/backends/backend_gtk3cairo.py
          - other changes to adjacent code, backported minimal change
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -425,12 +425,12 @@ def draw(self):
 
         toolbar = self.toolbar
         try:
-            if toolbar:
-                toolbar.set_cursor(cursors.WAIT)
+            # if toolbar:
+            #     toolbar.set_cursor(cursors.WAIT)
             self.figure.draw(self.renderer)
         finally:
-            if toolbar:
-                toolbar.set_cursor(toolbar._lastCursor)
+            # if toolbar:
+            #     toolbar.set_cursor(toolbar._lastCursor)
             RendererAgg.lock.release()
 
     def get_renderer(self, cleared=False):
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -388,8 +388,8 @@ def expose_event(self, widget, event):
         """Expose_event for all GTK backends. Should not be overridden.
         """
         toolbar = self.toolbar
-        if toolbar:
-            toolbar.set_cursor(cursors.WAIT)
+        # if toolbar:
+        #     toolbar.set_cursor(cursors.WAIT)
         if GTK_WIDGET_DRAWABLE(self):
             if self._need_redraw:
                 x, y, w, h = self.allocation
@@ -399,8 +399,8 @@ def expose_event(self, widget, event):
             x, y, w, h = event.area
             self.window.draw_drawable (self.style.fg_gc[self.state],
                                        self._pixmap, x, y, x, y, w, h)
-        if toolbar:
-            toolbar.set_cursor(toolbar._lastCursor)
+        # if toolbar:
+        #     toolbar.set_cursor(toolbar._lastCursor)
         return False  # finish event propagation?
 
     filetypes = FigureCanvasBase.filetypes.copy()
@@ -481,7 +481,6 @@ def flush_events(self):
         gtk.gdk.threads_leave()
 
 
-
 class FigureManagerGTK(FigureManagerBase):
     """
     Attributes
diff --git a/lib/matplotlib/backends/backend_gtk3cairo.py b/lib/matplotlib/backends/backend_gtk3cairo.py
@@ -37,14 +37,14 @@ def on_draw_event(self, widget, ctx):
         """ GtkDrawable draw event, like expose_event in GTK 2.X
         """
         toolbar = self.toolbar
-        if toolbar:
-            toolbar.set_cursor(cursors.WAIT)
+        # if toolbar:
+        #     toolbar.set_cursor(cursors.WAIT)
         self._renderer.set_context(ctx)
         allocation = self.get_allocation()
         x, y, w, h = allocation.x, allocation.y, allocation.width, allocation.height
         self._render_figure(w, h)
-        if toolbar:
-            toolbar.set_cursor(toolbar._lastCursor)
+        # if toolbar:
+        #     toolbar.set_cursor(toolbar._lastCursor)
         return False  # finish event propagation?
 
 
