Merged revisions 70176 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70176 | ronald.oussoren | 2009-03-04 22:35:05 +0100 (Wed, 04 Mar 2009) | 2 lines

  Fixes issues 3883 and 5194
........
This commit is contained in:
Ronald Oussoren 2009-03-04 21:35:38 +00:00
parent 5302a3011e
commit de3dfc1635
7 changed files with 75 additions and 19 deletions

View file

@ -33,6 +33,7 @@ import sys
import string
import re
import Tkinter
import macosxSupport
# the event type constants, which define the meaning of mc_type
MC_KEYPRESS=0; MC_KEYRELEASE=1; MC_BUTTONPRESS=2; MC_BUTTONRELEASE=3;
@ -45,7 +46,7 @@ MC_SHIFT = 1<<0; MC_CONTROL = 1<<2; MC_ALT = 1<<3; MC_META = 1<<5
MC_OPTION = 1<<6; MC_COMMAND = 1<<7
# define the list of modifiers, to be used in complex event types.
if sys.platform == "darwin" and sys.executable.count(".app"):
if macosxSupport.runningAsOSXApp():
_modifiers = (("Shift",), ("Control",), ("Option",), ("Command",))
_modifier_masks = (MC_SHIFT, MC_CONTROL, MC_OPTION, MC_COMMAND)
else: