Regenerated from Universal Headers 3.0.1 (which are changed
substantially from previous releases)
diff --git a/Mac/Lib/lib-toolbox/AppleEvents.py b/Mac/Lib/lib-toolbox/AppleEvents.py
index c491b80..3f3cad8 100644
--- a/Mac/Lib/lib-toolbox/AppleEvents.py
+++ b/Mac/Lib/lib-toolbox/AppleEvents.py
@@ -1,104 +1,55 @@
 # Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AppleEvents.h'
 
-typeBoolean = 'bool'
-typeChar = 'TEXT'
-typeSMInt = 'shor'
-typeInteger = 'long'
-typeSMFloat = 'sing'
-typeFloat = 'doub'
-typeLongInteger = 'long'
-typeShortInteger = 'shor'
-typeLongFloat = 'doub'
-typeShortFloat = 'sing'
-typeExtended = 'exte'
-typeComp = 'comp'
-typeMagnitude = 'magn'
-typeAEList = 'list'
-typeAERecord = 'reco'
-typeAppleEvent = 'aevt'
-typeTrue = 'true'
-typeFalse = 'fals'
-typeAlias = 'alis'
-typeEnumerated = 'enum'
-typeType = 'type'
-typeAppParameters = 'appa'
-typeProperty = 'prop'
-typeFSS = 'fss '
-typeKeyword = 'keyw'
-typeSectionH = 'sect'
-typeWildCard = '****'
-typeApplSignature = 'sign'
-typeQDRectangle = 'qdrt'
-typeFixed = 'fixd'
-typeSessionID = 'ssid'
-typeTargetID = 'targ'
-typeProcessSerialNumber = 'psn '
-typeNull = 'null'
-keyDirectObject = '----'
-keyErrorNumber = 'errn'
-keyErrorString = 'errs'
-keyProcessSerialNumber = 'psn '
-keyTransactionIDAttr = 'tran'
-keyReturnIDAttr = 'rtid'
-keyEventClassAttr = 'evcl'
-keyEventIDAttr = 'evid'
-keyAddressAttr = 'addr'
-keyOptionalKeywordAttr = 'optk'
-keyTimeoutAttr = 'timo'
-keyInteractLevelAttr = 'inte'
-keyEventSourceAttr = 'esrc'
-keyMissedKeywordAttr = 'miss'
-keyOriginalAddressAttr = 'from'
-keyPreDispatch = 'phac'
-keySelectProc = 'selh'
-keyAERecorderCount = 'recr'
-keyAEVersion = 'vers'
-kCoreEventClass = 'aevt'
-kAEOpenApplication = 'oapp'
-kAEOpenDocuments = 'odoc'
-kAEPrintDocuments = 'pdoc'
-kAEQuitApplication = 'quit'
-kAEAnswer = 'ansr'
-kAEApplicationDied = 'obit'
-kAENoReply = 0x00000001
-kAEQueueReply = 0x00000002
-kAEWaitReply = 0x00000003
+def FOUR_CHAR_CODE(x): return x
+from AEDataModel import *
+keyDirectObject = FOUR_CHAR_CODE('----')
+keyErrorNumber = FOUR_CHAR_CODE('errn')
+keyErrorString = FOUR_CHAR_CODE('errs')
+keyProcessSerialNumber = FOUR_CHAR_CODE('psn ')
+keyPreDispatch = FOUR_CHAR_CODE('phac')
+keySelectProc = FOUR_CHAR_CODE('selh')
+keyAERecorderCount = FOUR_CHAR_CODE('recr')
+keyAEVersion = FOUR_CHAR_CODE('vers')
+kCoreEventClass = FOUR_CHAR_CODE('aevt')
+kAEOpenApplication = FOUR_CHAR_CODE('oapp')
+kAEOpenDocuments = FOUR_CHAR_CODE('odoc')
+kAEPrintDocuments = FOUR_CHAR_CODE('pdoc')
+kAEQuitApplication = FOUR_CHAR_CODE('quit')
+kAEAnswer = FOUR_CHAR_CODE('ansr')
+kAEApplicationDied = FOUR_CHAR_CODE('obit')
+kAEStartRecording = FOUR_CHAR_CODE('reca')
+kAEStopRecording = FOUR_CHAR_CODE('recc')
+kAENotifyStartRecording = FOUR_CHAR_CODE('rec1')
+kAENotifyStopRecording = FOUR_CHAR_CODE('rec0')
+kAENotifyRecording = FOUR_CHAR_CODE('recr')
 kAENeverInteract = 0x00000010
 kAECanInteract = 0x00000020
 kAEAlwaysInteract = 0x00000030
 kAECanSwitchLayer = 0x00000040
-kAEDontReconnect = 0x00000080
 kAEDontRecord = 0x00001000
 kAEDontExecute = 0x00002000
-kAENormalPriority = 0x00000000
-kAEStartRecording = 'reca'
-kAEStopRecording = 'recc'
-kAENotifyStartRecording = 'rec1'
-kAENotifyStopRecording = 'rec0'
-kAENotifyRecording = 'recr'
-kAutoGenerateReturnID = -1
-kAnyTransactionID = 0
+kAEProcessNonReplyEvents = 0x00008000
+kAENoReply = 0x00000001
+kAEQueueReply = 0x00000002
+kAEWaitReply = 0x00000003
+kAEDontReconnect = 0x00000080
+kAEWantReceipt = 0x00000200
 kAEDefaultTimeout = -1
 kNoTimeOut = -2
-kAENoDispatch = 0
-kAEUseStandardDispatch = 0xFFFFFFFF
+kAENormalPriority = 0x00000000
+kAEHighPriority = 0x00000001
+kAEUnknownSource = 0
+kAEDirectCall = 1
+kAESameProcess = 2
+kAELocalProcess = 3
+kAERemoteProcess = 4
+kAEInteractWithSelf = 0
+kAEInteractWithLocal = 1
+kAEInteractWithAll = 2
 kAEDoNotIgnoreHandler = 0x00000000
 kAEIgnoreAppPhacHandler = 0x00000001
 kAEIgnoreAppEventHandler = 0x00000002
 kAEIgnoreSysPhacHandler = 0x00000004
 kAEIgnoreSysEventHandler = 0x00000008
 kAEIngoreBuiltInEventHandler = 0x00000010
-kAEDontDisposeOnResume = 0x80000000
-kAEInteractWithSelf = 0
-kAEInteractWithLocal = 1
-kAEInteractWithAll = 2
-kAEUnknownSource = 0
-kAEDirectCall = 1
-kAESameProcess = 2
-kAELocalProcess = 3
-kAERemoteProcess = 4
-kAEDataArray = 0
-kAEPackedArray = 1
-kAEHandleArray = 2
-kAEDescArray = 3
-kAEKeyDescArray = 4
+kAENoDispatch = 0