Merge branch 'patch-1' of git://github.com/krischer/matplotlib into krischer-patch-1

efiring · efiring · commit 0ef37a2f4360 · 2013-02-18T18:38:16.000-10:00
Conflicts:
	lib/matplotlib/widgets.py
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -829,7 +829,7 @@ class Cursor(AxesWidget):
 
     and the visibility of the cursor itself with the *visible* attribute
     """
-    def __init__(self, ax, useblit=False, **lineprops):
+    def __init__(self, ax, horizOn=True, vertOn=True, useblit=False, **lineprops):
         """
         Add a cursor to *ax*.  If ``useblit=True``, use the backend-
         dependent blitting features for faster updates (GTKAgg
@@ -844,8 +844,8 @@ def __init__(self, ax, useblit=False, **lineprops):
         self.connect_event('draw_event', self.clear)
 
         self.visible = True
-        self.horizOn = True
-        self.vertOn = True
+        self.horizOn = horizOn
+        self.vertOn = vertOn
         self.useblit = useblit and self.canvas.supports_blit
 
         if self.useblit:
