Merge branch 'v1.0.x'

efiring · efiring · commit 5314246eae76 · 2011-04-17T21:44:16.000-10:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+2011-04-17 Disable keyboard auto-repeat in qt4 backend by ignoring
+           key events resulting from auto-repeat.  This makes
+           constrained zoom/pan work. - EF
+
 2011-04-14 interpolation="nearest" always interpolate images. A new
            mode "none" is introduced for no interpolation - JJL
 
diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
@@ -212,11 +212,15 @@ def wheelEvent( self, event ):
 
     def keyPressEvent( self, event ):
         key = self._get_key( event )
+        if key is None:
+            return
         FigureCanvasBase.key_press_event( self, key )
         if DEBUG: print 'key press', key
 
     def keyReleaseEvent( self, event ):
         key = self._get_key(event)
+        if key is None:
+            return
         FigureCanvasBase.key_release_event( self, key )
         if DEBUG: print 'key release', key
 
@@ -241,6 +245,8 @@ def minumumSizeHint( self ):
         return QtCore.QSize( 10, 10 )
 
     def _get_key( self, event ):
+        if event.isAutoRepeat():
+            return None
         if event.key() < 256:
             key = str(event.text())
         elif event.key() in self.keyvald:
