Moved active and ignore logic to parent class.

JayP16 · JayP16 · commit 4032a27b04e9 · 2015-03-16T16:03:15.000-04:00
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -68,6 +68,29 @@ class Widget(object):
     """
     drawon = True
     eventson = True
+    _active = True
+
+    def set_active(self, active):
+        """Set whether the widget is active.
+        """
+        self._active = active
+
+    def get_active(self):
+        """Get whether the widget is active.
+        """
+        return self._active
+
+    # set_active is overriden by SelectorWidgets.
+    active = property(get_active, lambda self, active: self.set_active(active),
+                      doc="Is the widget active?")
+                      
+    def ignore(self, event):
+        """Return True if event should be ignored.
+
+        This method (or a version of it) should be called at the beginning
+        of any event callback.
+        """
+        return not self.active
 
 
 class AxesWidget(Widget):
@@ -96,7 +119,6 @@ def __init__(self, ax):
         self.ax = ax
         self.canvas = ax.figure.canvas
         self.cids = []
-        self._active = True
 
     def connect_event(self, event, callback):
         """Connect callback with an event.
@@ -112,28 +134,6 @@ def disconnect_events(self):
         for c in self.cids:
             self.canvas.mpl_disconnect(c)
 
-    def set_active(self, active):
-        """Set whether the widget is active.
-        """
-        self._active = active
-
-    def get_active(self):
-        """Get whether the widget is active.
-        """
-        return self._active
-
-    # set_active is overriden by SelectorWidgets.
-    active = property(get_active, lambda self, active: self.set_active(active),
-                      doc="Is the widget active?")
-
-    def ignore(self, event):
-        """Return True if event should be ignored.
-
-        This method (or a version of it) should be called at the beginning
-        of any event callback.
-        """
-        return not self.active
-
 
 class Button(AxesWidget):
     """
@@ -1020,7 +1020,6 @@ def __init__(self, canvas, axes, useblit=True, horizOn=False, vertOn=True,
         self.axes = axes
         self.horizOn = horizOn
         self.vertOn = vertOn
-        self.active = True
 
         xmin, xmax = axes[-1].get_xlim()
         ymin, ymax = axes[-1].get_ylim()
@@ -1105,13 +1104,6 @@ def _update(self):
 
             self.canvas.draw_idle()
             
-    def ignore(self, event):
-        """Return True if event should be ignored.
-
-        This method (or a version of it) should be called at the beginning
-        of any event callback.
-        """
-        return not self.active
 
 class _SelectorWidget(AxesWidget):
 
