Merge pull request #2696 from cgohlke/patch-3

pelson · pelson · commit 19b3598d59e3 · 2014-01-08T06:43:33.000-08:00
Fix Tk keyboard modifier masks on Windows
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -453,15 +453,20 @@ def _get_key(self, event):
         # In general, the modifier key is excluded from the modifier flag,
         # however this is not the case on "darwin", so double check that
         # we aren't adding repeat modifier flags to a modifier key.
-        modifiers = [(6, 'super', 'super'),
-                     (3, 'alt', 'alt'),
-                     (2, 'ctrl', 'control'),
-                    ]
-        if sys.platform == 'darwin':
+        if sys.platform == 'win32':
+            modifiers = [(17, 'alt', 'alt'),
+                         (2, 'ctrl', 'control'),
+                         ]
+        elif sys.platform == 'darwin':
             modifiers = [(3, 'super', 'super'),
                          (4, 'alt', 'alt'),
                          (2, 'ctrl', 'control'),
-                        ]
+                         ]
+        else:
+            modifiers = [(6, 'super', 'super'),
+                         (3, 'alt', 'alt'),
+                         (2, 'ctrl', 'control'),
+                         ]
 
         if key is not None:
             # note, shift is not added to the keys as this is already accounted for
