Regenerated from Universal Headers 3.0.1 (which are changed

substantially from previous releases)

1 files changed, 42 insertions, 20 deletions

diff --git a/Mac/Lib/lib-toolbox/Events.py b/Mac/Lib/lib-toolbox/Events.py
index 7f6652544e..2e6eb9fc97 100644
--- a/Mac/Lib/lib-toolbox/Events.py
+++ b/Mac/Lib/lib-toolbox/Events.py
@@ -11,35 +11,24 @@ diskEvt = 7
 activateEvt = 8
 osEvt = 15
 kHighLevelEvent = 23
-mDownMask = 0x0002
-mUpMask = 0x0004
-keyDownMask = 0x0008
-keyUpMask = 0x0010
-autoKeyMask = 0x0020
-updateMask = 0x0040
-diskMask = 0x0080
-activMask = 0x0100
+mDownMask = 1 << mouseDown
+mUpMask = 1 << mouseUp
+keyDownMask = 1 << keyDown
+keyUpMask = 1 << keyUp
+autoKeyMask = 1 << autoKey
+updateMask = 1 << updateEvt
+diskMask = 1 << diskEvt
+activMask = 1 << activateEvt
 highLevelEventMask = 0x0400
-osMask = 0x8000
+osMask = 1 << osEvt
 everyEvent = 0xFFFF
 charCodeMask = 0x000000FF
 keyCodeMask = 0x0000FF00
 adbAddrMask = 0x00FF0000
-osEvtMessageMask = 0xFF000000L
 mouseMovedMessage = 0x00FA
 suspendResumeMessage = 0x0001
 resumeFlag = 1
 convertClipboardFlag = 2
-activeFlag = 0x0001
-btnState = 0x0080
-cmdKey = 0x0100
-shiftKey = 0x0200
-alphaLock = 0x0400
-optionKey = 0x0800
-controlKey = 0x1000
-rightShiftKey = 0x2000
-rightOptionKey = 0x4000
-rightControlKey = 0x8000
 activeFlagBit = 0
 btnStateBit = 7
 cmdKeyBit = 8
@@ -50,6 +39,39 @@ controlKeyBit = 12
 rightShiftKeyBit = 13
 rightOptionKeyBit = 14
 rightControlKeyBit = 15
+activeFlag = 1 << activeFlagBit
+btnState = 1 << btnStateBit
+cmdKey = 1 << cmdKeyBit
+shiftKey = 1 << shiftKeyBit
+alphaLock = 1 << alphaLockBit
+optionKey = 1 << optionKeyBit
+controlKey = 1 << controlKeyBit
+rightShiftKey = 1 << rightShiftKeyBit
+rightOptionKey = 1 << rightOptionKeyBit
+rightControlKey = 1 << rightControlKeyBit
+kNullCharCode = 0
+kHomeCharCode = 1
+kEnterCharCode = 3
+kEndCharCode = 4
+kHelpCharCode = 5
+kBellCharCode = 7
+kBackspaceCharCode = 8
+kTabCharCode = 9
+kLineFeedCharCode = 10
+kVerticalTabCharCode = 11
+kPageUpCharCode = 11
+kFormFeedCharCode = 12
+kPageDownCharCode = 12
+kReturnCharCode = 13
+kFunctionKeyCharCode = 16
+kEscapeCharCode = 27
+kClearCharCode = 27
+kLeftArrowCharCode = 28
+kRightArrowCharCode = 29
+kUpArrowCharCode = 30
+kDownArrowCharCode = 31
+kDeleteCharCode = 127
+kNonBreakingSpaceCharCode = 202
 networkEvt = 10
 driverEvt = 11
 app1Evt = 12