Regenerated from Universal Headers 3.0.1 (which are changed
substantially from previous releases)
diff --git a/Mac/Lib/lib-toolbox/AEObjects.py b/Mac/Lib/lib-toolbox/AEObjects.py
index 38a8e1b..7d4f28e 100644
--- a/Mac/Lib/lib-toolbox/AEObjects.py
+++ b/Mac/Lib/lib-toolbox/AEObjects.py
@@ -1,50 +1,51 @@
 # Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AEObjects.h'
 
-kAEAND = 'AND '
-kAEOR = 'OR  '
-kAENOT = 'NOT '
-kAEFirst = 'firs'
-kAELast = 'last'
-kAEMiddle = 'midd'
-kAEAny = 'any '
-kAEAll = 'all '
-kAENext = 'next'
-kAEPrevious = 'prev'
-keyAECompOperator = 'relo'
-keyAELogicalTerms = 'term'
-keyAELogicalOperator = 'logc'
-keyAEObject1 = 'obj1'
-keyAEObject2 = 'obj2'
-keyAEDesiredClass = 'want'
-keyAEContainer = 'from'
-keyAEKeyForm = 'form'
-keyAEKeyData = 'seld'
-keyAERangeStart = 'star'
-keyAERangeStop = 'stop'
-keyDisposeTokenProc = 'xtok'
-keyAECompareProc = 'cmpr'
-keyAECountProc = 'cont'
-keyAEMarkTokenProc = 'mkid'
-keyAEMarkProc = 'mark'
-keyAEAdjustMarksProc = 'adjm'
-keyAEGetErrDescProc = 'indc'
-formAbsolutePosition = 'indx'
-formRelativePosition = 'rele'
-formTest = 'test'
-formRange = 'rang'
-formPropertyID = 'prop'
-formName = 'name'
-typeObjectSpecifier = 'obj '
-typeObjectBeingExamined = 'exmn'
-typeCurrentContainer = 'ccnt'
-typeToken = 'toke'
-typeRelativeDescriptor = 'rel '
-typeAbsoluteOrdinal = 'abso'
-typeIndexDescriptor = 'inde'
-typeRangeDescriptor = 'rang'
-typeLogicalDescriptor = 'logi'
-typeCompDescriptor = 'cmpd'
-typeOSLTokenList = 'ostl'
+def FOUR_CHAR_CODE(x): return x
+kAEAND = FOUR_CHAR_CODE('AND ')
+kAEOR = FOUR_CHAR_CODE('OR  ')
+kAENOT = FOUR_CHAR_CODE('NOT ')
+kAEFirst = FOUR_CHAR_CODE('firs')
+kAELast = FOUR_CHAR_CODE('last')
+kAEMiddle = FOUR_CHAR_CODE('midd')
+kAEAny = FOUR_CHAR_CODE('any ')
+kAEAll = FOUR_CHAR_CODE('all ')
+kAENext = FOUR_CHAR_CODE('next')
+kAEPrevious = FOUR_CHAR_CODE('prev')
+keyAECompOperator = FOUR_CHAR_CODE('relo')
+keyAELogicalTerms = FOUR_CHAR_CODE('term')
+keyAELogicalOperator = FOUR_CHAR_CODE('logc')
+keyAEObject1 = FOUR_CHAR_CODE('obj1')
+keyAEObject2 = FOUR_CHAR_CODE('obj2')
+keyAEDesiredClass = FOUR_CHAR_CODE('want')
+keyAEContainer = FOUR_CHAR_CODE('from')
+keyAEKeyForm = FOUR_CHAR_CODE('form')
+keyAEKeyData = FOUR_CHAR_CODE('seld')
+keyAERangeStart = FOUR_CHAR_CODE('star')
+keyAERangeStop = FOUR_CHAR_CODE('stop')
+keyDisposeTokenProc = FOUR_CHAR_CODE('xtok')
+keyAECompareProc = FOUR_CHAR_CODE('cmpr')
+keyAECountProc = FOUR_CHAR_CODE('cont')
+keyAEMarkTokenProc = FOUR_CHAR_CODE('mkid')
+keyAEMarkProc = FOUR_CHAR_CODE('mark')
+keyAEAdjustMarksProc = FOUR_CHAR_CODE('adjm')
+keyAEGetErrDescProc = FOUR_CHAR_CODE('indc')
+formAbsolutePosition = FOUR_CHAR_CODE('indx')
+formRelativePosition = FOUR_CHAR_CODE('rele')
+formTest = FOUR_CHAR_CODE('test')
+formRange = FOUR_CHAR_CODE('rang')
+formPropertyID = FOUR_CHAR_CODE('prop')
+formName = FOUR_CHAR_CODE('name')
+typeObjectSpecifier = FOUR_CHAR_CODE('obj ')
+typeObjectBeingExamined = FOUR_CHAR_CODE('exmn')
+typeCurrentContainer = FOUR_CHAR_CODE('ccnt')
+typeToken = FOUR_CHAR_CODE('toke')
+typeRelativeDescriptor = FOUR_CHAR_CODE('rel ')
+typeAbsoluteOrdinal = FOUR_CHAR_CODE('abso')
+typeIndexDescriptor = FOUR_CHAR_CODE('inde')
+typeRangeDescriptor = FOUR_CHAR_CODE('rang')
+typeLogicalDescriptor = FOUR_CHAR_CODE('logi')
+typeCompDescriptor = FOUR_CHAR_CODE('cmpd')
+typeOSLTokenList = FOUR_CHAR_CODE('ostl')
 kAEIDoMinimum = 0x0000
 kAEIDoWhose = 0x0001
 kAEIDoMarking = 0x0004
@@ -52,10 +53,10 @@
 kAEResolveNestedLists = 0x0010
 kAEHandleSimpleRanges = 0x0020
 kAEUseRelativeIterators = 0x0040
-typeWhoseDescriptor = 'whos'
-formWhose = 'whos'
-typeWhoseRange = 'wrng'
-keyAEWhoseRangeStart = 'wstr'
-keyAEWhoseRangeStop = 'wstp'
-keyAEIndex = 'kidx'
-keyAETest = 'ktst'
+typeWhoseDescriptor = FOUR_CHAR_CODE('whos')
+formWhose = FOUR_CHAR_CODE('whos')
+typeWhoseRange = FOUR_CHAR_CODE('wrng')
+keyAEWhoseRangeStart = FOUR_CHAR_CODE('wstr')
+keyAEWhoseRangeStop = FOUR_CHAR_CODE('wstp')
+keyAEIndex = FOUR_CHAR_CODE('kidx')
+keyAETest = FOUR_CHAR_CODE('ktst')
diff --git a/Mac/Lib/lib-toolbox/AERegistry.py b/Mac/Lib/lib-toolbox/AERegistry.py
index c4c918b..fac197a 100644
--- a/Mac/Lib/lib-toolbox/AERegistry.py
+++ b/Mac/Lib/lib-toolbox/AERegistry.py
@@ -1,427 +1,476 @@
 # Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:AERegistry.h'
 
-cAEList = 'list'
-cApplication = 'capp'
-cArc = 'carc'
-cBoolean = 'bool'
-cCell = 'ccel'
-cChar = 'cha '
-cColorTable = 'clrt'
-cColumn = 'ccol'
-cDocument = 'docu'
-cDrawingArea = 'cdrw'
-cEnumeration = 'enum'
-cFile = 'file'
-cFixed = 'fixd'
-cFixedPoint = 'fpnt'
-cFixedRectangle = 'frct'
-cGraphicLine = 'glin'
-cGraphicObject = 'cgob'
-cGraphicShape = 'cgsh'
-cGraphicText = 'cgtx'
-cGroupedGraphic = 'cpic'
-cInsertionLoc = 'insl'
-cInsertionPoint = 'cins'
-cIntlText = 'itxt'
-cIntlWritingCode = 'intl'
-cItem = 'citm'
-cLine = 'clin'
-cLongDateTime = 'ldt '
-cLongFixed = 'lfxd'
-cLongFixedPoint = 'lfpt'
-cLongFixedRectangle = 'lfrc'
-cLongInteger = 'long'
-cLongPoint = 'lpnt'
-cLongRectangle = 'lrct'
-cMachineLoc = 'mLoc'
-cMenu = 'cmnu'
-cMenuItem = 'cmen'
-cObject = 'cobj'
-cObjectSpecifier = 'obj '
-cOpenableObject = 'coob'
-cOval = 'covl'
-cParagraph = 'cpar'
-cPICT = 'PICT'
-cPixel = 'cpxl'
-cPixelMap = 'cpix'
-cPolygon = 'cpgn'
-cProperty = 'prop'
-cQDPoint = 'QDpt'
-cQDRectangle = 'qdrt'
-cRectangle = 'crec'
-cRGBColor = 'cRGB'
-cRotation = 'trot'
-cRoundedRectangle = 'crrc'
-cRow = 'crow'
-cSelection = 'csel'
-cShortInteger = 'shor'
-cTable = 'ctbl'
-cText = 'ctxt'
-cTextFlow = 'cflo'
-cTextStyles = 'tsty'
-cType = 'type'
-cVersion = 'vers'
-cWindow = 'cwin'
-cWord = 'cwor'
-enumArrows = 'arro'
-enumJustification = 'just'
-enumKeyForm = 'kfrm'
-enumPosition = 'posi'
-enumProtection = 'prtn'
-enumQuality = 'qual'
-enumSaveOptions = 'savo'
-enumStyle = 'styl'
-enumTransferMode = 'tran'
-formUniqueID = 'ID  '
-kAEAbout = 'abou'
-kAEAfter = 'afte'
-kAEAliasSelection = 'sali'
-kAEAllCaps = 'alcp'
-kAEArrowAtEnd = 'aren'
-kAEArrowAtStart = 'arst'
-kAEArrowBothEnds = 'arbo'
-kAEAsk = 'ask '
-kAEBefore = 'befo'
-kAEBeginning = 'bgng'
-kAEBeginsWith = 'bgwt'
-kAEBeginTransaction = 'begi'
-kAEBold = 'bold'
-kAECaseSensEquals = 'cseq'
-kAECentered = 'cent'
-kAEChangeView = 'view'
-kAEClone = 'clon'
-kAEClose = 'clos'
-kAECondensed = 'cond'
-kAEContains = 'cont'
-kAECopy = 'copy'
-kAECoreSuite = 'core'
-kAECountElements = 'cnte'
-kAECreateElement = 'crel'
-kAECreatePublisher = 'cpub'
-kAECut = 'cut '
-kAEDelete = 'delo'
-kAEDoObjectsExist = 'doex'
-kAEDoScript = 'dosc'
-kAEDrag = 'drag'
-kAEDuplicateSelection = 'sdup'
-kAEEditGraphic = 'edit'
-kAEEmptyTrash = 'empt'
-kAEEnd = 'end '
-kAEEndsWith = 'ends'
-kAEEndTransaction = 'endt'
-kAEEquals = '=   '
-kAEExpanded = 'pexp'
-kAEFast = 'fast'
-kAEFinderEvents = 'FNDR'
-kAEFormulaProtect = 'fpro'
-kAEFullyJustified = 'full'
-kAEGetClassInfo = 'qobj'
-kAEGetData = 'getd'
-kAEGetDataSize = 'dsiz'
-kAEGetEventInfo = 'gtei'
-kAEGetInfoSelection = 'sinf'
-kAEGetPrivilegeSelection = 'sprv'
-kAEGetSuiteInfo = 'gtsi'
-kAEGreaterThan = '>   '
-kAEGreaterThanEquals = '>=  '
-kAEGrow = 'grow'
-kAEHidden = 'hidn'
-kAEHiQuality = 'hiqu'
-kAEImageGraphic = 'imgr'
-kAEIsUniform = 'isun'
-kAEItalic = 'ital'
-kAELeftJustified = 'left'
-kAELessThan = '<   '
-kAELessThanEquals = '<=  '
-kAELowercase = 'lowc'
-kAEMakeObjectsVisible = 'mvis'
-kAEMiscStandards = 'misc'
-kAEModifiable = 'modf'
-kAEMove = 'move'
-kAENo = 'no  '
-kAENoArrow = 'arno'
-kAENonmodifiable = 'nmod'
-kAEOpen = 'odoc'
-kAEOpenSelection = 'sope'
-kAEOutline = 'outl'
-kAEPageSetup = 'pgsu'
-kAEPaste = 'past'
-kAEPlain = 'plan'
-kAEPrint = 'pdoc'
-kAEPrintSelection = 'spri'
-kAEPrintWindow = 'pwin'
-kAEPutAwaySelection = 'sput'
-kAEQDAddOver = 'addo'
-kAEQDAddPin = 'addp'
-kAEQDAdMax = 'admx'
-kAEQDAdMin = 'admn'
-kAEQDBic = 'bic '
-kAEQDBlend = 'blnd'
-kAEQDCopy = 'cpy '
-kAEQDNotBic = 'nbic'
-kAEQDNotCopy = 'ncpy'
-kAEQDNotOr = 'ntor'
-kAEQDNotXor = 'nxor'
-kAEQDOr = 'or  '
-kAEQDSubOver = 'subo'
-kAEQDSubPin = 'subp'
-kAEQDSupplementalSuite = 'qdsp'
-kAEQDXor = 'xor '
-kAEQuickdrawSuite = 'qdrw'
-kAEQuitAll = 'quia'
-kAERedo = 'redo'
-kAERegular = 'regl'
-kAEReplace = 'rplc'
-kAERequiredSuite = 'reqd'
-kAERestart = 'rest'
-kAERevealSelection = 'srev'
-kAERevert = 'rvrt'
-kAERightJustified = 'rght'
-kAESave = 'save'
-kAESelect = 'slct'
-kAESetData = 'setd'
-kAESetPosition = 'posn'
-kAEShadow = 'shad'
-kAEShowClipboard = 'shcl'
-kAEShutDown = 'shut'
-kAESleep = 'slep'
-kAESmallCaps = 'smcp'
-kAESpecialClassProperties = 'c@#!'
-kAEStrikethrough = 'strk'
-kAESubscript = 'sbsc'
-kAESuperscript = 'spsc'
-kAETableSuite = 'tbls'
-kAETextSuite = 'TEXT'
-kAETransactionTerminated = 'ttrm'
-kAEUnderline = 'undl'
-kAEUndo = 'undo'
-kAEWholeWordEquals = 'wweq'
-kAEYes = 'yes '
-kAEZoom = 'zoom'
-keyAEAngle = 'kang'
-keyAEArcAngle = 'parc'
-keyAEBaseAddr = 'badd'
-keyAEBestType = 'pbst'
-keyAEBgndColor = 'kbcl'
-keyAEBgndPattern = 'kbpt'
-keyAEBounds = 'pbnd'
-keyAECellList = 'kclt'
-keyAEClassID = 'clID'
-keyAEColor = 'colr'
-keyAEColorTable = 'cltb'
-keyAECurveHeight = 'kchd'
-keyAECurveWidth = 'kcwd'
-keyAEDashStyle = 'pdst'
-keyAEData = 'data'
-keyAEDefaultType = 'deft'
-keyAEDefinitionRect = 'pdrt'
-keyAEDescType = 'dstp'
-keyAEDestination = 'dest'
-keyAEDoAntiAlias = 'anta'
-keyAEDoDithered = 'gdit'
-keyAEDoRotate = 'kdrt'
-keyAEDoScale = 'ksca'
-keyAEDoTranslate = 'ktra'
-keyAEEditionFileLoc = 'eloc'
-keyAEElements = 'elms'
-keyAEEndPoint = 'pend'
-keyAEEventClass = 'evcl'
-keyAEEventID = 'evti'
-keyAEFile = 'kfil'
-keyAEFileType = 'fltp'
-keyAEFillColor = 'flcl'
-keyAEFillPattern = 'flpt'
-keyAEFlipHorizontal = 'kfho'
-keyAEFlipVertical = 'kfvt'
-keyAEFont = 'font'
-keyAEFormula = 'pfor'
-keyAEGraphicObjects = 'gobs'
-keyAEID = 'ID  '
-keyAEImageQuality = 'gqua'
-keyAEInsertHere = 'insh'
-keyAEKeyForms = 'keyf'
-keyAEKeyword = 'kywd'
-keyAELevel = 'levl'
-keyAELineArrow = 'arro'
-keyAEName = 'pnam'
-keyAENewElementLoc = 'pnel'
-keyAEObject = 'kobj'
-keyAEObjectClass = 'kocl'
-keyAEOffStyles = 'ofst'
-keyAEOnStyles = 'onst'
-keyAEParameters = 'prms'
-keyAEParamFlags = 'pmfg'
-keyAEPenColor = 'ppcl'
-keyAEPenPattern = 'pppa'
-keyAEPenWidth = 'ppwd'
-keyAEPixelDepth = 'pdpt'
-keyAEPixMapMinus = 'kpmm'
-keyAEPMTable = 'kpmt'
-keyAEPointList = 'ptlt'
-keyAEPointSize = 'ptsz'
-keyAEPosition = 'kpos'
-keyAEPropData = 'prdt'
-keyAEProperties = 'qpro'
-keyAEProperty = 'kprp'
-keyAEPropFlags = 'prfg'
-keyAEPropID = 'prop'
-keyAEProtection = 'ppro'
-keyAERenderAs = 'kren'
-keyAERequestedType = 'rtyp'
-keyAEResult = '----'
-keyAEResultInfo = 'rsin'
-keyAERotation = 'prot'
-keyAERotPoint = 'krtp'
-keyAERowList = 'krls'
-keyAESaveOptions = 'savo'
-keyAEScale = 'pscl'
-keyAEScriptTag = 'psct'
-keyAEShowWhere = 'show'
-keyAEStartAngle = 'pang'
-keyAEStartPoint = 'pstp'
-keyAEStyles = 'ksty'
-keyAESuiteID = 'suit'
-keyAEText = 'ktxt'
-keyAETextColor = 'ptxc'
-keyAETextFont = 'ptxf'
-keyAETextPointSize = 'ptps'
-keyAETextStyles = 'txst'
-keyAETheText = 'thtx'
-keyAETransferMode = 'pptm'
-keyAETranslation = 'ptrs'
-keyAETryAsStructGraf = 'toog'
-keyAEUniformStyles = 'ustl'
-keyAEUpdateOn = 'pupd'
-keyAEUserTerm = 'utrm'
-keyAEWindow = 'wndw'
-keyAEWritingCode = 'wrcd'
-keyAETSMScriptTag = 'sclg'
-keyAETSMTextFont = 'ktxf'
-keyAETSMTextPointSize = 'ktps'
-keyMiscellaneous = 'fmsc'
-keySelection = 'fsel'
-keyWindow = 'kwnd'
-pArcAngle = 'parc'
-pBackgroundColor = 'pbcl'
-pBackgroundPattern = 'pbpt'
-pBestType = 'pbst'
-pBounds = 'pbnd'
-pClass = 'pcls'
-pClipboard = 'pcli'
-pColor = 'colr'
-pColorTable = 'cltb'
-pContents = 'pcnt'
-pCornerCurveHeight = 'pchd'
-pCornerCurveWidth = 'pcwd'
-pDashStyle = 'pdst'
-pDefaultType = 'deft'
-pDefinitionRect = 'pdrt'
-pEnabled = 'enbl'
-pEndPoint = 'pend'
-pFillColor = 'flcl'
-pFillPattern = 'flpt'
-pFont = 'font'
-pFormula = 'pfor'
-pGraphicObjects = 'gobs'
-pHasCloseBox = 'hclb'
-pHasTitleBar = 'ptit'
-pID = 'ID  '
-pIndex = 'pidx'
-pInsertionLoc = 'pins'
-pIsFloating = 'isfl'
-pIsFrontProcess = 'pisf'
-pIsModal = 'pmod'
-pIsModified = 'imod'
-pIsResizable = 'prsz'
-pIsStationeryPad = 'pspd'
-pIsZoomable = 'iszm'
-pIsZoomed = 'pzum'
-pItemNumber = 'itmn'
-pJustification = 'pjst'
-pLineArrow = 'arro'
-pMenuID = 'mnid'
-pName = 'pnam'
-pNewElementLoc = 'pnel'
-pPenColor = 'ppcl'
-pPenPattern = 'pppa'
-pPenWidth = 'ppwd'
-pPixelDepth = 'pdpt'
-pPointList = 'ptlt'
-pPointSize = 'ptsz'
-pProtection = 'ppro'
-pRotation = 'prot'
-pScale = 'pscl'
-pScript = 'scpt'
-pScriptTag = 'psct'
-pSelected = 'selc'
-pSelection = 'sele'
-pStartAngle = 'pang'
-pStartPoint = 'pstp'
-pTextColor = 'ptxc'
-pTextFont = 'ptxf'
-pTextItemDelimiters = 'txdl'
-pTextPointSize = 'ptps'
-pTextStyles = 'txst'
-pTransferMode = 'pptm'
-pTranslation = 'ptrs'
-pUniformStyles = 'ustl'
-pUpdateOn = 'pupd'
-pUserSelection = 'pusl'
-pVersion = 'vers'
-pVisible = 'pvis'
-typeAEText = 'tTXT'
-typeArc = 'carc'
-typeBest = 'best'
-typeCell = 'ccel'
-typeClassInfo = 'gcli'
-typeColorTable = 'clrt'
-typeColumn = 'ccol'
-typeDashStyle = 'tdas'
-typeData = 'tdta'
-typeDrawingArea = 'cdrw'
-typeElemInfo = 'elin'
-typeEnumeration = 'enum'
-typeEPS = 'EPS '
-typeEventInfo = 'evin'
-typeFinderWindow = 'fwin'
-typeFixedPoint = 'fpnt'
-typeFixedRectangle = 'frct'
-typeGraphicLine = 'glin'
-typeGraphicText = 'cgtx'
-typeGroupedGraphic = 'cpic'
-typeInsertionLoc = 'insl'
-typeIntlText = 'itxt'
-typeIntlWritingCode = 'intl'
-typeLongDateTime = 'ldt '
-typeLongFixed = 'lfxd'
-typeLongFixedPoint = 'lfpt'
-typeLongFixedRectangle = 'lfrc'
-typeLongPoint = 'lpnt'
-typeLongRectangle = 'lrct'
-typeMachineLoc = 'mLoc'
-typeOval = 'covl'
-typeParamInfo = 'pmin'
-typePict = 'PICT'
-typePixelMap = 'cpix'
-typePixMapMinus = 'tpmm'
-typePolygon = 'cpgn'
-typePropInfo = 'pinf'
-typeQDPoint = 'QDpt'
-typeRectangle = 'crec'
-typeRGB16 = 'tr16'
-typeRGB96 = 'tr96'
-typeRGBColor = 'cRGB'
-typeRotation = 'trot'
-typeRoundedRectangle = 'crrc'
-typeRow = 'crow'
-typeScrapStyles = 'styl'
-typeScript = 'scpt'
-typeStyledText = 'STXT'
-typeSuiteInfo = 'suin'
-typeTable = 'ctbl'
-typeTextStyles = 'tsty'
-typeTIFF = 'TIFF'
-typeVersion = 'vers'
+def FOUR_CHAR_CODE(x): return x
+from AEDataModel import *
+cAEList = FOUR_CHAR_CODE('list')
+cApplication = FOUR_CHAR_CODE('capp')
+cArc = FOUR_CHAR_CODE('carc')
+cBoolean = FOUR_CHAR_CODE('bool')
+cCell = FOUR_CHAR_CODE('ccel')
+cChar = FOUR_CHAR_CODE('cha ')
+cColorTable = FOUR_CHAR_CODE('clrt')
+cColumn = FOUR_CHAR_CODE('ccol')
+cDocument = FOUR_CHAR_CODE('docu')
+cDrawingArea = FOUR_CHAR_CODE('cdrw')
+cEnumeration = FOUR_CHAR_CODE('enum')
+cFile = FOUR_CHAR_CODE('file')
+cFixed = FOUR_CHAR_CODE('fixd')
+cFixedPoint = FOUR_CHAR_CODE('fpnt')
+cFixedRectangle = FOUR_CHAR_CODE('frct')
+cGraphicLine = FOUR_CHAR_CODE('glin')
+cGraphicObject = FOUR_CHAR_CODE('cgob')
+cGraphicShape = FOUR_CHAR_CODE('cgsh')
+cGraphicText = FOUR_CHAR_CODE('cgtx')
+cGroupedGraphic = FOUR_CHAR_CODE('cpic')
+cInsertionLoc = FOUR_CHAR_CODE('insl')
+cInsertionPoint = FOUR_CHAR_CODE('cins')
+cIntlText = FOUR_CHAR_CODE('itxt')
+cIntlWritingCode = FOUR_CHAR_CODE('intl')
+cItem = FOUR_CHAR_CODE('citm')
+cLine = FOUR_CHAR_CODE('clin')
+cLongDateTime = FOUR_CHAR_CODE('ldt ')
+cLongFixed = FOUR_CHAR_CODE('lfxd')
+cLongFixedPoint = FOUR_CHAR_CODE('lfpt')
+cLongFixedRectangle = FOUR_CHAR_CODE('lfrc')
+cLongInteger = FOUR_CHAR_CODE('long')
+cLongPoint = FOUR_CHAR_CODE('lpnt')
+cLongRectangle = FOUR_CHAR_CODE('lrct')
+cMachineLoc = FOUR_CHAR_CODE('mLoc')
+cMenu = FOUR_CHAR_CODE('cmnu')
+cMenuItem = FOUR_CHAR_CODE('cmen')
+cObject = FOUR_CHAR_CODE('cobj')
+cObjectSpecifier = FOUR_CHAR_CODE('obj ')
+cOpenableObject = FOUR_CHAR_CODE('coob')
+cOval = FOUR_CHAR_CODE('covl')
+cParagraph = FOUR_CHAR_CODE('cpar')
+cPICT = FOUR_CHAR_CODE('PICT')
+cPixel = FOUR_CHAR_CODE('cpxl')
+cPixelMap = FOUR_CHAR_CODE('cpix')
+cPolygon = FOUR_CHAR_CODE('cpgn')
+cProperty = FOUR_CHAR_CODE('prop')
+cQDPoint = FOUR_CHAR_CODE('QDpt')
+cQDRectangle = FOUR_CHAR_CODE('qdrt')
+cRectangle = FOUR_CHAR_CODE('crec')
+cRGBColor = FOUR_CHAR_CODE('cRGB')
+cRotation = FOUR_CHAR_CODE('trot')
+cRoundedRectangle = FOUR_CHAR_CODE('crrc')
+cRow = FOUR_CHAR_CODE('crow')
+cSelection = FOUR_CHAR_CODE('csel')
+cShortInteger = FOUR_CHAR_CODE('shor')
+cTable = FOUR_CHAR_CODE('ctbl')
+cText = FOUR_CHAR_CODE('ctxt')
+cTextFlow = FOUR_CHAR_CODE('cflo')
+cTextStyles = FOUR_CHAR_CODE('tsty')
+cType = FOUR_CHAR_CODE('type')
+cVersion = FOUR_CHAR_CODE('vers')
+cWindow = FOUR_CHAR_CODE('cwin')
+cWord = FOUR_CHAR_CODE('cwor')
+enumArrows = FOUR_CHAR_CODE('arro')
+enumJustification = FOUR_CHAR_CODE('just')
+enumKeyForm = FOUR_CHAR_CODE('kfrm')
+enumPosition = FOUR_CHAR_CODE('posi')
+enumProtection = FOUR_CHAR_CODE('prtn')
+enumQuality = FOUR_CHAR_CODE('qual')
+enumSaveOptions = FOUR_CHAR_CODE('savo')
+enumStyle = FOUR_CHAR_CODE('styl')
+enumTransferMode = FOUR_CHAR_CODE('tran')
+formUniqueID = FOUR_CHAR_CODE('ID  ')
+kAEAbout = FOUR_CHAR_CODE('abou')
+kAEAfter = FOUR_CHAR_CODE('afte')
+kAEAliasSelection = FOUR_CHAR_CODE('sali')
+kAEAllCaps = FOUR_CHAR_CODE('alcp')
+kAEArrowAtEnd = FOUR_CHAR_CODE('aren')
+kAEArrowAtStart = FOUR_CHAR_CODE('arst')
+kAEArrowBothEnds = FOUR_CHAR_CODE('arbo')
+kAEAsk = FOUR_CHAR_CODE('ask ')
+kAEBefore = FOUR_CHAR_CODE('befo')
+kAEBeginning = FOUR_CHAR_CODE('bgng')
+kAEBeginsWith = FOUR_CHAR_CODE('bgwt')
+kAEBeginTransaction = FOUR_CHAR_CODE('begi')
+kAEBold = FOUR_CHAR_CODE('bold')
+kAECaseSensEquals = FOUR_CHAR_CODE('cseq')
+kAECentered = FOUR_CHAR_CODE('cent')
+kAEChangeView = FOUR_CHAR_CODE('view')
+kAEClone = FOUR_CHAR_CODE('clon')
+kAEClose = FOUR_CHAR_CODE('clos')
+kAECondensed = FOUR_CHAR_CODE('cond')
+kAEContains = FOUR_CHAR_CODE('cont')
+kAECopy = FOUR_CHAR_CODE('copy')
+kAECoreSuite = FOUR_CHAR_CODE('core')
+kAECountElements = FOUR_CHAR_CODE('cnte')
+kAECreateElement = FOUR_CHAR_CODE('crel')
+kAECreatePublisher = FOUR_CHAR_CODE('cpub')
+kAECut = FOUR_CHAR_CODE('cut ')
+kAEDelete = FOUR_CHAR_CODE('delo')
+kAEDoObjectsExist = FOUR_CHAR_CODE('doex')
+kAEDoScript = FOUR_CHAR_CODE('dosc')
+kAEDrag = FOUR_CHAR_CODE('drag')
+kAEDuplicateSelection = FOUR_CHAR_CODE('sdup')
+kAEEditGraphic = FOUR_CHAR_CODE('edit')
+kAEEmptyTrash = FOUR_CHAR_CODE('empt')
+kAEEnd = FOUR_CHAR_CODE('end ')
+kAEEndsWith = FOUR_CHAR_CODE('ends')
+kAEEndTransaction = FOUR_CHAR_CODE('endt')
+kAEEquals = FOUR_CHAR_CODE('=   ')
+kAEExpanded = FOUR_CHAR_CODE('pexp')
+kAEFast = FOUR_CHAR_CODE('fast')
+kAEFinderEvents = FOUR_CHAR_CODE('FNDR')
+kAEFormulaProtect = FOUR_CHAR_CODE('fpro')
+kAEFullyJustified = FOUR_CHAR_CODE('full')
+kAEGetClassInfo = FOUR_CHAR_CODE('qobj')
+kAEGetData = FOUR_CHAR_CODE('getd')
+kAEGetDataSize = FOUR_CHAR_CODE('dsiz')
+kAEGetEventInfo = FOUR_CHAR_CODE('gtei')
+kAEGetInfoSelection = FOUR_CHAR_CODE('sinf')
+kAEGetPrivilegeSelection = FOUR_CHAR_CODE('sprv')
+kAEGetSuiteInfo = FOUR_CHAR_CODE('gtsi')
+kAEGreaterThan = FOUR_CHAR_CODE('>   ')
+kAEGreaterThanEquals = FOUR_CHAR_CODE('>=  ')
+kAEGrow = FOUR_CHAR_CODE('grow')
+kAEHidden = FOUR_CHAR_CODE('hidn')
+kAEHiQuality = FOUR_CHAR_CODE('hiqu')
+kAEImageGraphic = FOUR_CHAR_CODE('imgr')
+kAEIsUniform = FOUR_CHAR_CODE('isun')
+kAEItalic = FOUR_CHAR_CODE('ital')
+kAELeftJustified = FOUR_CHAR_CODE('left')
+kAELessThan = FOUR_CHAR_CODE('<   ')
+kAELessThanEquals = FOUR_CHAR_CODE('<=  ')
+kAELowercase = FOUR_CHAR_CODE('lowc')
+kAEMakeObjectsVisible = FOUR_CHAR_CODE('mvis')
+kAEMiscStandards = FOUR_CHAR_CODE('misc')
+kAEModifiable = FOUR_CHAR_CODE('modf')
+kAEMove = FOUR_CHAR_CODE('move')
+kAENo = FOUR_CHAR_CODE('no  ')
+kAENoArrow = FOUR_CHAR_CODE('arno')
+kAENonmodifiable = FOUR_CHAR_CODE('nmod')
+kAEOpen = FOUR_CHAR_CODE('odoc')
+kAEOpenSelection = FOUR_CHAR_CODE('sope')
+kAEOutline = FOUR_CHAR_CODE('outl')
+kAEPageSetup = FOUR_CHAR_CODE('pgsu')
+kAEPaste = FOUR_CHAR_CODE('past')
+kAEPlain = FOUR_CHAR_CODE('plan')
+kAEPrint = FOUR_CHAR_CODE('pdoc')
+kAEPrintSelection = FOUR_CHAR_CODE('spri')
+kAEPrintWindow = FOUR_CHAR_CODE('pwin')
+kAEPutAwaySelection = FOUR_CHAR_CODE('sput')
+kAEQDAddOver = FOUR_CHAR_CODE('addo')
+kAEQDAddPin = FOUR_CHAR_CODE('addp')
+kAEQDAdMax = FOUR_CHAR_CODE('admx')
+kAEQDAdMin = FOUR_CHAR_CODE('admn')
+kAEQDBic = FOUR_CHAR_CODE('bic ')
+kAEQDBlend = FOUR_CHAR_CODE('blnd')
+kAEQDCopy = FOUR_CHAR_CODE('cpy ')
+kAEQDNotBic = FOUR_CHAR_CODE('nbic')
+kAEQDNotCopy = FOUR_CHAR_CODE('ncpy')
+kAEQDNotOr = FOUR_CHAR_CODE('ntor')
+kAEQDNotXor = FOUR_CHAR_CODE('nxor')
+kAEQDOr = FOUR_CHAR_CODE('or  ')
+kAEQDSubOver = FOUR_CHAR_CODE('subo')
+kAEQDSubPin = FOUR_CHAR_CODE('subp')
+kAEQDSupplementalSuite = FOUR_CHAR_CODE('qdsp')
+kAEQDXor = FOUR_CHAR_CODE('xor ')
+kAEQuickdrawSuite = FOUR_CHAR_CODE('qdrw')
+kAEQuitAll = FOUR_CHAR_CODE('quia')
+kAERedo = FOUR_CHAR_CODE('redo')
+kAERegular = FOUR_CHAR_CODE('regl')
+kAEReplace = FOUR_CHAR_CODE('rplc')
+kAERequiredSuite = FOUR_CHAR_CODE('reqd')
+kAERestart = FOUR_CHAR_CODE('rest')
+kAERevealSelection = FOUR_CHAR_CODE('srev')
+kAERevert = FOUR_CHAR_CODE('rvrt')
+kAERightJustified = FOUR_CHAR_CODE('rght')
+kAESave = FOUR_CHAR_CODE('save')
+kAESelect = FOUR_CHAR_CODE('slct')
+kAESetData = FOUR_CHAR_CODE('setd')
+kAESetPosition = FOUR_CHAR_CODE('posn')
+kAEShadow = FOUR_CHAR_CODE('shad')
+kAEShowClipboard = FOUR_CHAR_CODE('shcl')
+kAEShutDown = FOUR_CHAR_CODE('shut')
+kAESleep = FOUR_CHAR_CODE('slep')
+kAESmallCaps = FOUR_CHAR_CODE('smcp')
+kAESpecialClassProperties = FOUR_CHAR_CODE('c@#!')
+kAEStrikethrough = FOUR_CHAR_CODE('strk')
+kAESubscript = FOUR_CHAR_CODE('sbsc')
+kAESuperscript = FOUR_CHAR_CODE('spsc')
+kAETableSuite = FOUR_CHAR_CODE('tbls')
+kAETextSuite = FOUR_CHAR_CODE('TEXT')
+kAETransactionTerminated = FOUR_CHAR_CODE('ttrm')
+kAEUnderline = FOUR_CHAR_CODE('undl')
+kAEUndo = FOUR_CHAR_CODE('undo')
+kAEWholeWordEquals = FOUR_CHAR_CODE('wweq')
+kAEYes = FOUR_CHAR_CODE('yes ')
+kAEZoom = FOUR_CHAR_CODE('zoom')
+kAEMouseClass = FOUR_CHAR_CODE('mous')
+kAEDown = FOUR_CHAR_CODE('down')
+kAEUp = FOUR_CHAR_CODE('up  ')
+kAEMoved = FOUR_CHAR_CODE('move')
+kAEStoppedMoving = FOUR_CHAR_CODE('stop')
+kAEWindowClass = FOUR_CHAR_CODE('wind')
+kAEUpdate = FOUR_CHAR_CODE('updt')
+kAEActivate = FOUR_CHAR_CODE('actv')
+kAEDeactivate = FOUR_CHAR_CODE('dact')
+kAECommandClass = FOUR_CHAR_CODE('cmnd')
+kAEKeyClass = FOUR_CHAR_CODE('keyc')
+kAERawKey = FOUR_CHAR_CODE('rkey')
+kAEVirtualKey = FOUR_CHAR_CODE('keyc')
+kAENavigationKey = FOUR_CHAR_CODE('nave')
+kAEAutoDown = FOUR_CHAR_CODE('auto')
+kAEApplicationClass = FOUR_CHAR_CODE('appl')
+kAESuspend = FOUR_CHAR_CODE('susp')
+kAEResume = FOUR_CHAR_CODE('rsme')
+kAEDiskEvent = FOUR_CHAR_CODE('disk')
+kAENullEvent = FOUR_CHAR_CODE('null')
+kAEWakeUpEvent = FOUR_CHAR_CODE('wake')
+kAEScrapEvent = FOUR_CHAR_CODE('scrp')
+kAEHighLevel = FOUR_CHAR_CODE('high')
+keyAEAngle = FOUR_CHAR_CODE('kang')
+keyAEArcAngle = FOUR_CHAR_CODE('parc')
+keyAEBaseAddr = FOUR_CHAR_CODE('badd')
+keyAEBestType = FOUR_CHAR_CODE('pbst')
+keyAEBgndColor = FOUR_CHAR_CODE('kbcl')
+keyAEBgndPattern = FOUR_CHAR_CODE('kbpt')
+keyAEBounds = FOUR_CHAR_CODE('pbnd')
+keyAECellList = FOUR_CHAR_CODE('kclt')
+keyAEClassID = FOUR_CHAR_CODE('clID')
+keyAEColor = FOUR_CHAR_CODE('colr')
+keyAEColorTable = FOUR_CHAR_CODE('cltb')
+keyAECurveHeight = FOUR_CHAR_CODE('kchd')
+keyAECurveWidth = FOUR_CHAR_CODE('kcwd')
+keyAEDashStyle = FOUR_CHAR_CODE('pdst')
+keyAEData = FOUR_CHAR_CODE('data')
+keyAEDefaultType = FOUR_CHAR_CODE('deft')
+keyAEDefinitionRect = FOUR_CHAR_CODE('pdrt')
+keyAEDescType = FOUR_CHAR_CODE('dstp')
+keyAEDestination = FOUR_CHAR_CODE('dest')
+keyAEDoAntiAlias = FOUR_CHAR_CODE('anta')
+keyAEDoDithered = FOUR_CHAR_CODE('gdit')
+keyAEDoRotate = FOUR_CHAR_CODE('kdrt')
+keyAEDoScale = FOUR_CHAR_CODE('ksca')
+keyAEDoTranslate = FOUR_CHAR_CODE('ktra')
+keyAEEditionFileLoc = FOUR_CHAR_CODE('eloc')
+keyAEElements = FOUR_CHAR_CODE('elms')
+keyAEEndPoint = FOUR_CHAR_CODE('pend')
+keyAEEventClass = FOUR_CHAR_CODE('evcl')
+keyAEEventID = FOUR_CHAR_CODE('evti')
+keyAEFile = FOUR_CHAR_CODE('kfil')
+keyAEFileType = FOUR_CHAR_CODE('fltp')
+keyAEFillColor = FOUR_CHAR_CODE('flcl')
+keyAEFillPattern = FOUR_CHAR_CODE('flpt')
+keyAEFlipHorizontal = FOUR_CHAR_CODE('kfho')
+keyAEFlipVertical = FOUR_CHAR_CODE('kfvt')
+keyAEFont = FOUR_CHAR_CODE('font')
+keyAEFormula = FOUR_CHAR_CODE('pfor')
+keyAEGraphicObjects = FOUR_CHAR_CODE('gobs')
+keyAEID = FOUR_CHAR_CODE('ID  ')
+keyAEImageQuality = FOUR_CHAR_CODE('gqua')
+keyAEInsertHere = FOUR_CHAR_CODE('insh')
+keyAEKeyForms = FOUR_CHAR_CODE('keyf')
+keyAEKeyword = FOUR_CHAR_CODE('kywd')
+keyAELevel = FOUR_CHAR_CODE('levl')
+keyAELineArrow = FOUR_CHAR_CODE('arro')
+keyAEName = FOUR_CHAR_CODE('pnam')
+keyAENewElementLoc = FOUR_CHAR_CODE('pnel')
+keyAEObject = FOUR_CHAR_CODE('kobj')
+keyAEObjectClass = FOUR_CHAR_CODE('kocl')
+keyAEOffStyles = FOUR_CHAR_CODE('ofst')
+keyAEOnStyles = FOUR_CHAR_CODE('onst')
+keyAEParameters = FOUR_CHAR_CODE('prms')
+keyAEParamFlags = FOUR_CHAR_CODE('pmfg')
+keyAEPenColor = FOUR_CHAR_CODE('ppcl')
+keyAEPenPattern = FOUR_CHAR_CODE('pppa')
+keyAEPenWidth = FOUR_CHAR_CODE('ppwd')
+keyAEPixelDepth = FOUR_CHAR_CODE('pdpt')
+keyAEPixMapMinus = FOUR_CHAR_CODE('kpmm')
+keyAEPMTable = FOUR_CHAR_CODE('kpmt')
+keyAEPointList = FOUR_CHAR_CODE('ptlt')
+keyAEPointSize = FOUR_CHAR_CODE('ptsz')
+keyAEPosition = FOUR_CHAR_CODE('kpos')
+keyAEPropData = FOUR_CHAR_CODE('prdt')
+keyAEProperties = FOUR_CHAR_CODE('qpro')
+keyAEProperty = FOUR_CHAR_CODE('kprp')
+keyAEPropFlags = FOUR_CHAR_CODE('prfg')
+keyAEPropID = FOUR_CHAR_CODE('prop')
+keyAEProtection = FOUR_CHAR_CODE('ppro')
+keyAERenderAs = FOUR_CHAR_CODE('kren')
+keyAERequestedType = FOUR_CHAR_CODE('rtyp')
+keyAEResult = FOUR_CHAR_CODE('----')
+keyAEResultInfo = FOUR_CHAR_CODE('rsin')
+keyAERotation = FOUR_CHAR_CODE('prot')
+keyAERotPoint = FOUR_CHAR_CODE('krtp')
+keyAERowList = FOUR_CHAR_CODE('krls')
+keyAESaveOptions = FOUR_CHAR_CODE('savo')
+keyAEScale = FOUR_CHAR_CODE('pscl')
+keyAEScriptTag = FOUR_CHAR_CODE('psct')
+keyAEShowWhere = FOUR_CHAR_CODE('show')
+keyAEStartAngle = FOUR_CHAR_CODE('pang')
+keyAEStartPoint = FOUR_CHAR_CODE('pstp')
+keyAEStyles = FOUR_CHAR_CODE('ksty')
+keyAESuiteID = FOUR_CHAR_CODE('suit')
+keyAEText = FOUR_CHAR_CODE('ktxt')
+keyAETextColor = FOUR_CHAR_CODE('ptxc')
+keyAETextFont = FOUR_CHAR_CODE('ptxf')
+keyAETextPointSize = FOUR_CHAR_CODE('ptps')
+keyAETextStyles = FOUR_CHAR_CODE('txst')
+keyAETextLineHeight = FOUR_CHAR_CODE('ktlh')
+keyAETextLineAscent = FOUR_CHAR_CODE('ktas')
+keyAETheText = FOUR_CHAR_CODE('thtx')
+keyAETransferMode = FOUR_CHAR_CODE('pptm')
+keyAETranslation = FOUR_CHAR_CODE('ptrs')
+keyAETryAsStructGraf = FOUR_CHAR_CODE('toog')
+keyAEUniformStyles = FOUR_CHAR_CODE('ustl')
+keyAEUpdateOn = FOUR_CHAR_CODE('pupd')
+keyAEUserTerm = FOUR_CHAR_CODE('utrm')
+keyAEWindow = FOUR_CHAR_CODE('wndw')
+keyAEWritingCode = FOUR_CHAR_CODE('wrcd')
+keyMiscellaneous = FOUR_CHAR_CODE('fmsc')
+keySelection = FOUR_CHAR_CODE('fsel')
+keyWindow = FOUR_CHAR_CODE('kwnd')
+keyWhen = FOUR_CHAR_CODE('when')
+keyWhere = FOUR_CHAR_CODE('wher')
+keyModifiers = FOUR_CHAR_CODE('mods')
+keyKey = FOUR_CHAR_CODE('key ')
+keyKeyCode = FOUR_CHAR_CODE('code')
+keyKeyboard = FOUR_CHAR_CODE('keyb')
+keyDriveNumber = FOUR_CHAR_CODE('drv#')
+keyErrorCode = FOUR_CHAR_CODE('err#')
+keyHighLevelClass = FOUR_CHAR_CODE('hcls')
+keyHighLevelID = FOUR_CHAR_CODE('hid ')
+pArcAngle = FOUR_CHAR_CODE('parc')
+pBackgroundColor = FOUR_CHAR_CODE('pbcl')
+pBackgroundPattern = FOUR_CHAR_CODE('pbpt')
+pBestType = FOUR_CHAR_CODE('pbst')
+pBounds = FOUR_CHAR_CODE('pbnd')
+pClass = FOUR_CHAR_CODE('pcls')
+pClipboard = FOUR_CHAR_CODE('pcli')
+pColor = FOUR_CHAR_CODE('colr')
+pColorTable = FOUR_CHAR_CODE('cltb')
+pContents = FOUR_CHAR_CODE('pcnt')
+pCornerCurveHeight = FOUR_CHAR_CODE('pchd')
+pCornerCurveWidth = FOUR_CHAR_CODE('pcwd')
+pDashStyle = FOUR_CHAR_CODE('pdst')
+pDefaultType = FOUR_CHAR_CODE('deft')
+pDefinitionRect = FOUR_CHAR_CODE('pdrt')
+pEnabled = FOUR_CHAR_CODE('enbl')
+pEndPoint = FOUR_CHAR_CODE('pend')
+pFillColor = FOUR_CHAR_CODE('flcl')
+pFillPattern = FOUR_CHAR_CODE('flpt')
+pFont = FOUR_CHAR_CODE('font')
+pFormula = FOUR_CHAR_CODE('pfor')
+pGraphicObjects = FOUR_CHAR_CODE('gobs')
+pHasCloseBox = FOUR_CHAR_CODE('hclb')
+pHasTitleBar = FOUR_CHAR_CODE('ptit')
+pID = FOUR_CHAR_CODE('ID  ')
+pIndex = FOUR_CHAR_CODE('pidx')
+pInsertionLoc = FOUR_CHAR_CODE('pins')
+pIsFloating = FOUR_CHAR_CODE('isfl')
+pIsFrontProcess = FOUR_CHAR_CODE('pisf')
+pIsModal = FOUR_CHAR_CODE('pmod')
+pIsModified = FOUR_CHAR_CODE('imod')
+pIsResizable = FOUR_CHAR_CODE('prsz')
+pIsStationeryPad = FOUR_CHAR_CODE('pspd')
+pIsZoomable = FOUR_CHAR_CODE('iszm')
+pIsZoomed = FOUR_CHAR_CODE('pzum')
+pItemNumber = FOUR_CHAR_CODE('itmn')
+pJustification = FOUR_CHAR_CODE('pjst')
+pLineArrow = FOUR_CHAR_CODE('arro')
+pMenuID = FOUR_CHAR_CODE('mnid')
+pName = FOUR_CHAR_CODE('pnam')
+pNewElementLoc = FOUR_CHAR_CODE('pnel')
+pPenColor = FOUR_CHAR_CODE('ppcl')
+pPenPattern = FOUR_CHAR_CODE('pppa')
+pPenWidth = FOUR_CHAR_CODE('ppwd')
+pPixelDepth = FOUR_CHAR_CODE('pdpt')
+pPointList = FOUR_CHAR_CODE('ptlt')
+pPointSize = FOUR_CHAR_CODE('ptsz')
+pProtection = FOUR_CHAR_CODE('ppro')
+pRotation = FOUR_CHAR_CODE('prot')
+pScale = FOUR_CHAR_CODE('pscl')
+pScript = FOUR_CHAR_CODE('scpt')
+pScriptTag = FOUR_CHAR_CODE('psct')
+pSelected = FOUR_CHAR_CODE('selc')
+pSelection = FOUR_CHAR_CODE('sele')
+pStartAngle = FOUR_CHAR_CODE('pang')
+pStartPoint = FOUR_CHAR_CODE('pstp')
+pTextColor = FOUR_CHAR_CODE('ptxc')
+pTextFont = FOUR_CHAR_CODE('ptxf')
+pTextItemDelimiters = FOUR_CHAR_CODE('txdl')
+pTextPointSize = FOUR_CHAR_CODE('ptps')
+pTextStyles = FOUR_CHAR_CODE('txst')
+pTransferMode = FOUR_CHAR_CODE('pptm')
+pTranslation = FOUR_CHAR_CODE('ptrs')
+pUniformStyles = FOUR_CHAR_CODE('ustl')
+pUpdateOn = FOUR_CHAR_CODE('pupd')
+pUserSelection = FOUR_CHAR_CODE('pusl')
+pVersion = FOUR_CHAR_CODE('vers')
+pVisible = FOUR_CHAR_CODE('pvis')
+typeAEText = FOUR_CHAR_CODE('tTXT')
+typeArc = FOUR_CHAR_CODE('carc')
+typeBest = FOUR_CHAR_CODE('best')
+typeCell = FOUR_CHAR_CODE('ccel')
+typeClassInfo = FOUR_CHAR_CODE('gcli')
+typeColorTable = FOUR_CHAR_CODE('clrt')
+typeColumn = FOUR_CHAR_CODE('ccol')
+typeDashStyle = FOUR_CHAR_CODE('tdas')
+typeData = FOUR_CHAR_CODE('tdta')
+typeDrawingArea = FOUR_CHAR_CODE('cdrw')
+typeElemInfo = FOUR_CHAR_CODE('elin')
+typeEnumeration = FOUR_CHAR_CODE('enum')
+typeEPS = FOUR_CHAR_CODE('EPS ')
+typeEventInfo = FOUR_CHAR_CODE('evin')
+typeFinderWindow = FOUR_CHAR_CODE('fwin')
+typeFixedPoint = FOUR_CHAR_CODE('fpnt')
+typeFixedRectangle = FOUR_CHAR_CODE('frct')
+typeGraphicLine = FOUR_CHAR_CODE('glin')
+typeGraphicText = FOUR_CHAR_CODE('cgtx')
+typeGroupedGraphic = FOUR_CHAR_CODE('cpic')
+typeInsertionLoc = FOUR_CHAR_CODE('insl')
+typeIntlText = FOUR_CHAR_CODE('itxt')
+typeIntlWritingCode = FOUR_CHAR_CODE('intl')
+typeLongDateTime = FOUR_CHAR_CODE('ldt ')
+typeLongFixed = FOUR_CHAR_CODE('lfxd')
+typeLongFixedPoint = FOUR_CHAR_CODE('lfpt')
+typeLongFixedRectangle = FOUR_CHAR_CODE('lfrc')
+typeLongPoint = FOUR_CHAR_CODE('lpnt')
+typeLongRectangle = FOUR_CHAR_CODE('lrct')
+typeMachineLoc = FOUR_CHAR_CODE('mLoc')
+typeOval = FOUR_CHAR_CODE('covl')
+typeParamInfo = FOUR_CHAR_CODE('pmin')
+typePict = FOUR_CHAR_CODE('PICT')
+typePixelMap = FOUR_CHAR_CODE('cpix')
+typePixMapMinus = FOUR_CHAR_CODE('tpmm')
+typePolygon = FOUR_CHAR_CODE('cpgn')
+typePropInfo = FOUR_CHAR_CODE('pinf')
+typeQDPoint = FOUR_CHAR_CODE('QDpt')
+typeRectangle = FOUR_CHAR_CODE('crec')
+typeRGB16 = FOUR_CHAR_CODE('tr16')
+typeRGB96 = FOUR_CHAR_CODE('tr96')
+typeRGBColor = FOUR_CHAR_CODE('cRGB')
+typeRotation = FOUR_CHAR_CODE('trot')
+typeRoundedRectangle = FOUR_CHAR_CODE('crrc')
+typeRow = FOUR_CHAR_CODE('crow')
+typeScrapStyles = FOUR_CHAR_CODE('styl')
+typeScript = FOUR_CHAR_CODE('scpt')
+typeStyledText = FOUR_CHAR_CODE('STXT')
+typeSuiteInfo = FOUR_CHAR_CODE('suin')
+typeTable = FOUR_CHAR_CODE('ctbl')
+typeTextStyles = FOUR_CHAR_CODE('tsty')
+typeTIFF = FOUR_CHAR_CODE('TIFF')
+typeVersion = FOUR_CHAR_CODE('vers')
+kAEMenuClass = FOUR_CHAR_CODE('menu')
+kAEMenuSelect = FOUR_CHAR_CODE('mhit')
+kAEMouseDown = FOUR_CHAR_CODE('mdwn')
+kAEMouseDownInBack = FOUR_CHAR_CODE('mdbk')
+kAEKeyDown = FOUR_CHAR_CODE('kdwn')
+kAEResized = FOUR_CHAR_CODE('rsiz')
+kAEPromise = FOUR_CHAR_CODE('prom')
+keyMenuID = FOUR_CHAR_CODE('mid ')
+keyMenuItem = FOUR_CHAR_CODE('mitm')
+keyCloseAllWindows = FOUR_CHAR_CODE('caw ')
+keyOriginalBounds = FOUR_CHAR_CODE('obnd')
+keyNewBounds = FOUR_CHAR_CODE('nbnd')
+keyLocalWhere = FOUR_CHAR_CODE('lwhr')
+typeHIMenu = FOUR_CHAR_CODE('mobj')
+typeHIWindow = FOUR_CHAR_CODE('wobj')
 kBySmallIcon = 0
 kByIconView = 1
 kByNameView = 2
@@ -436,3 +485,47 @@
 kAESharing = 13
 kAEZoomIn = 7
 kAEZoomOut = 8
+kTextServiceClass = FOUR_CHAR_CODE('tsvc')
+kUpdateActiveInputArea = FOUR_CHAR_CODE('updt')
+kShowHideInputWindow = FOUR_CHAR_CODE('shiw')
+kPos2Offset = FOUR_CHAR_CODE('p2st')
+kOffset2Pos = FOUR_CHAR_CODE('st2p')
+keyAETSMDocumentRefcon = FOUR_CHAR_CODE('refc')
+keyAEServerInstance = FOUR_CHAR_CODE('srvi')
+keyAETheData = FOUR_CHAR_CODE('kdat')
+keyAEFixLength = FOUR_CHAR_CODE('fixl')
+keyAEUpdateRange = FOUR_CHAR_CODE('udng')
+keyAECurrentPoint = FOUR_CHAR_CODE('cpos')
+keyAEBufferSize = FOUR_CHAR_CODE('buff')
+keyAEMoveView = FOUR_CHAR_CODE('mvvw')
+keyAENextBody = FOUR_CHAR_CODE('nxbd')
+keyAETSMScriptTag = FOUR_CHAR_CODE('sclg')
+keyAETSMTextFont = FOUR_CHAR_CODE('ktxf')
+keyAETSMTextPointSize = FOUR_CHAR_CODE('ktps')
+typeTextRange = FOUR_CHAR_CODE('txrn')
+typeComponentInstance = FOUR_CHAR_CODE('cmpi')
+typeOffsetArray = FOUR_CHAR_CODE('ofay')
+typeTextRangeArray = FOUR_CHAR_CODE('tray')
+typeText = typeChar
+kTSMOutsideOfBody = 1
+kTSMInsideOfBody = 2
+kTSMInsideOfActiveInputArea = 3
+kNextBody = 1
+kPreviousBody = 2
+kCaretPosition = 1
+kRawText = 2
+kSelectedRawText = 3
+kConvertedText = 4
+kSelectedConvertedText = 5
+kBlockFillText = 6
+kOutlineText = 7
+kSelectedText = 8
+keyAEHiliteRange = FOUR_CHAR_CODE('hrng')
+keyAEPinRange = FOUR_CHAR_CODE('pnrg')
+keyAEClauseOffsets = FOUR_CHAR_CODE('clau')
+keyAEOffset = FOUR_CHAR_CODE('ofst')
+keyAEPoint = FOUR_CHAR_CODE('gpos')
+keyAELeftSide = FOUR_CHAR_CODE('klef')
+keyAERegionClass = FOUR_CHAR_CODE('rgnc')
+keyAEDragging = FOUR_CHAR_CODE('bool')
+keyAELeadingEdge = keyAELeftSide
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
diff --git a/Mac/Lib/lib-toolbox/Balloons.py b/Mac/Lib/lib-toolbox/Balloons.py
index 5a9a754..a9018aa 100644
--- a/Mac/Lib/lib-toolbox/Balloons.py
+++ b/Mac/Lib/lib-toolbox/Balloons.py
@@ -1,5 +1,15 @@
-# Generated from 'Moes:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Balloons.h'
+# Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Balloons.h'
 
+def FOUR_CHAR_CODE(x): return x
+kTopLeftTipPointsLeftVariant = 0
+kTopLeftTipPointsUpVariant = 1
+kTopRightTipPointsUpVariant = 2
+kTopRightTipPointsRightVariant = 3
+kBottomRightTipPointsRightVariant = 4
+kBottomRightTipPointsDownVariant = 5
+kBottomLeftTipPointsDownVariant = 6
+kBottomLeftTipPointsLeftVariant = 7
+kBalloonVariantCount = 8
 hmBalloonHelpVersion = 0x0002
 kHMHelpMenuID = -16490
 kHMAboutHelpItem = 1
@@ -30,17 +40,17 @@
 khmmTERes = 6
 khmmSTRRes = 7
 kHMEnabledItem = 0
-kHMTETextResType = 'TEXT'
-kHMTEStyleResType = 'styl'
+kHMTETextResType = FOUR_CHAR_CODE('TEXT')
+kHMTEStyleResType = FOUR_CHAR_CODE('styl')
 kHMDisabledItem = 1
 kHMCheckedItem = 2
 kHMOtherItem = 3
 kHMRegularWindow = 0
 kHMSaveBitsNoWindow = 1
 kHMSaveBitsWindow = 2
-kHMMenuResType = 'hmnu'
-kHMDialogResType = 'hdlg'
-kHMWindListResType = 'hwin'
-kHMRectListResType = 'hrct'
-kHMOverrideResType = 'hovr'
-kHMFinderApplResType = 'hfdr'
+kHMMenuResType = FOUR_CHAR_CODE('hmnu')
+kHMDialogResType = FOUR_CHAR_CODE('hdlg')
+kHMWindListResType = FOUR_CHAR_CODE('hwin')
+kHMRectListResType = FOUR_CHAR_CODE('hrct')
+kHMOverrideResType = FOUR_CHAR_CODE('hovr')
+kHMFinderApplResType = FOUR_CHAR_CODE('hfdr')
diff --git a/Mac/Lib/lib-toolbox/Components.py b/Mac/Lib/lib-toolbox/Components.py
index 338feeb..aa7631f 100644
--- a/Mac/Lib/lib-toolbox/Components.py
+++ b/Mac/Lib/lib-toolbox/Components.py
@@ -1,7 +1,8 @@
 # Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Components.h'
 
-kAppleManufacturer = 'appl'
-kComponentResourceType = 'thng'
+def FOUR_CHAR_CODE(x): return x
+kAppleManufacturer = FOUR_CHAR_CODE('appl')
+kComponentResourceType = FOUR_CHAR_CODE('thng')
 kAnyComponentType = 0
 kAnyComponentSubType = 0
 kAnyComponentManufacturer = 0
diff --git a/Mac/Lib/lib-toolbox/Controls.py b/Mac/Lib/lib-toolbox/Controls.py
index aa150f5..7c8b0bf 100644
--- a/Mac/Lib/lib-toolbox/Controls.py
+++ b/Mac/Lib/lib-toolbox/Controls.py
@@ -1,15 +1,254 @@
 # Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Controls.h'
 
+def FOUR_CHAR_CODE(x): return x
+from TextEdit import *
+from QuickDraw import *
+
+_ControlDispatch = 0xAA73
+kControlDefProcType = FOUR_CHAR_CODE('CDEF')
+kControlTemplateResourceType = FOUR_CHAR_CODE('CNTL')
+kControlColorTableResourceType = FOUR_CHAR_CODE('cctb')
+kControlDefProcResourceType = FOUR_CHAR_CODE('CDEF')
+kControlTabListResType = FOUR_CHAR_CODE('tab#')
+kControlListDescResType = FOUR_CHAR_CODE('ldes')
+cFrameColor = 0
+cBodyColor = 1
+cTextColor = 2
+cThumbColor = 3
+kNumberCtlCTabEntries = 4
+errMessageNotSupported = -30580
+errDataNotSupported = -30581
+errControlDoesntSupportFocus = -30582
+errWindowDoesntSupportFocus = -30583
+errUnknownControl = -30584
+errCouldntSetFocus = -30585
+errNoRootControl = -30586
+errRootAlreadyExists = -30587
+errInvalidPartCode = -30588
+errControlsAlreadyExist = -30589
+errControlIsNotEmbedder = -30590
+errDataSizeMismatch = -30591
+errControlHiddenOrDisabled = -30592
+errWindowRegionCodeInvalid = -30593
+errCantEmbedIntoSelf = -30594
+errCantEmbedRoot = -30595
+errItemNotControl = -30596
 pushButProc = 0
 checkBoxProc = 1
 radioButProc = 2
 scrollBarProc = 16
 popupMenuProc = 1008
+kControlSupportsNewMessages = FOUR_CHAR_CODE(' ok ')
+kControlFocusNoPart = 0
+kControlFocusNextPart = -1
+kControlFocusPrevPart = -2
+kControlKeyFilterBlockKey = 0
+kControlKeyFilterPassKey = 1
+kControlFontBigSystemFont = -1
+kControlFontSmallSystemFont = -2
+kControlFontSmallBoldSystemFont = -3
+kControlUseFontMask = 0x0001
+kControlUseFaceMask = 0x0002
+kControlUseSizeMask = 0x0004
+kControlUseForeColorMask = 0x0008
+kControlUseBackColorMask = 0x0010
+kControlUseModeMask = 0x0020
+kControlUseJustMask = 0x0040
+kControlUseAllMask = 0x00FF
+kControlAddFontSizeMask = 0x0100
+kControlFontStyleTag = FOUR_CHAR_CODE('font')
+kControlKeyFilterTag = FOUR_CHAR_CODE('fltr')
+kControlSupportsGhosting = 1 << 0
+kControlSupportsEmbedding = 1 << 1
+kControlSupportsFocus = 1 << 2
+kControlWantsIdle = 1 << 3
+kControlWantsActivate = 1 << 4
+kControlHandlesTracking = 1 << 5
+kControlSupportsDataAccess = 1 << 6
+kControlHasSpecialBackground = 1 << 7
+kControlGetsFocusOnClick = 1 << 8
+kControlSupportsCalcBestRect = 1 << 9
+kControlSupportsLiveFeedback = 1 << 10
+kControlHasRadioBehavior = 1 << 11
+kControlMsgDrawGhost = 13
+kControlMsgCalcBestRect = 14
+kControlMsgHandleTracking = 15
+kControlMsgFocus = 16
+kControlMsgKeyDown = 17
+kControlMsgIdle = 18
+kControlMsgGetFeatures = 19
+kControlMsgSetData = 20
+kControlMsgGetData = 21
+kControlMsgActivate = 22
+kControlMsgSetUpBackground = 23
+kControlMsgCalcValue = 24
+kControlMsgSubControlHit = 25
+kControlMsgCalcValueFromPos = 26
+kControlMsgTestNewMsgSupport = 27
+kControlMsgSubControlAdded = 28
+kControlMsgSubControlRemoved = 29
+kControlBevelButtonSmallBevelProc = 32
+kControlBevelButtonNormalBevelProc = 33
+kControlBevelButtonLargeBevelProc = 34
+kControlBevelButtonAlignSysDirection = -1
+kControlBevelButtonAlignCenter = 0
+kControlBevelButtonAlignLeft = 1
+kControlBevelButtonAlignRight = 2
+kControlBevelButtonAlignTop = 3
+kControlBevelButtonAlignBottom = 4
+kControlBevelButtonAlignTopLeft = 5
+kControlBevelButtonAlignBottomLeft = 6
+kControlBevelButtonAlignTopRight = 7
+kControlBevelButtonAlignBottomRight = 8
+kControlBevelButtonAlignTextSysDirection = teFlushDefault
+kControlBevelButtonAlignTextCenter = teCenter
+kControlBevelButtonAlignTextFlushRight = teFlushRight
+kControlBevelButtonAlignTextFlushLeft = teFlushLeft
+kControlBevelButtonPlaceSysDirection = -1
+kControlBevelButtonPlaceNormally = 0
+kControlBevelButtonPlaceToRightOfGraphic = 1
+kControlBevelButtonPlaceToLeftOfGraphic = 2
+kControlBevelButtonPlaceBelowGraphic = 3
+kControlBevelButtonPlaceAboveGraphic = 4
+kControlBevelButtonSmallBevelVariant = 0
+kControlBehaviorPushbutton = 0
+kControlBehaviorToggles = 0x0100
+kControlBehaviorSticky = 0x0200
+kControlBehaviorMultiValueMenu = 0x4000
+kControlBehaviorOffsetContents = 0x8000
+kControlBehaviorCommandMenu = 0x2000
+kControlContentTextOnly = 0
+kControlContentIconSuiteRes = 1
+kControlContentCIconRes = 2
+kControlContentPictRes = 3
+kControlContentIconSuiteHandle = 129
+kControlContentCIconHandle = 130
+kControlContentPictHandle = 131
+kControlContentIconRef = 132
+kControlBevelButtonContentTag = FOUR_CHAR_CODE('cont')
+kControlBevelButtonTransformTag = FOUR_CHAR_CODE('tran')
+kControlBevelButtonTextAlignTag = FOUR_CHAR_CODE('tali')
+kControlBevelButtonTextOffsetTag = FOUR_CHAR_CODE('toff')
+kControlBevelButtonGraphicAlignTag = FOUR_CHAR_CODE('gali')
+kControlBevelButtonGraphicOffsetTag = FOUR_CHAR_CODE('goff')
+kControlBevelButtonTextPlaceTag = FOUR_CHAR_CODE('tplc')
+kControlBevelButtonMenuValueTag = FOUR_CHAR_CODE('mval')
+kControlBevelButtonMenuHandleTag = FOUR_CHAR_CODE('mhnd')
+kControlBevelButtonLastMenuTag = FOUR_CHAR_CODE('lmnu')
+kControlBevelButtonMenuDelayTag = FOUR_CHAR_CODE('mdly')
+kControlSliderProc = 48
+kControlTriangleProc = 64
+kControlTriangleLeftFacingProc = 65
+kControlTriangleAutoToggleProc = 66
+kControlTriangleLeftFacingAutoToggleProc = 67
+kControlTriangleLastValueTag = FOUR_CHAR_CODE('last')
+kControlProgressBarProc = 80
+kControlLittleArrowsProc = 96
+kControlChasingArrowsProc = 112
+kControlTabLargeProc = 128
+kControlTabSmallProc = 129
+kControlTabContentRectTag = FOUR_CHAR_CODE('rect')
+kControlTabEnabledFlagTag = FOUR_CHAR_CODE('enab')
+kControlTabFontStyleTag = kControlFontStyleTag
+kControlSeparatorLineProc = 144
+kControlGroupBoxTextTitleProc = 160
+kControlGroupBoxCheckBoxProc = 161
+kControlGroupBoxPopupButtonProc = 162
+kControlGroupBoxSecondaryTextTitleProc = 164
+kControlGroupBoxSecondaryCheckBoxProc = 165
+kControlGroupBoxSecondaryPopupButtonProc = 166
+kControlGroupBoxMenuHandleTag = FOUR_CHAR_CODE('mhan')
+kControlGroupBoxFontStyleTag = kControlFontStyleTag
+kControlImageWellProc = 176
+kControlImageWellContentTag = FOUR_CHAR_CODE('cont')
+kControlImageWellTransformTag = FOUR_CHAR_CODE('tran')
+kControlPopupArrowEastProc = 192
+kControlPopupArrowWestProc = 193
+kControlPopupArrowNorthProc = 194
+kControlPopupArrowSouthProc = 195
+kControlPopupArrowSmallEastProc = 196
+kControlPopupArrowSmallWestProc = 197
+kControlPopupArrowSmallNorthProc = 198
+kControlPopupArrowSmallSouthProc = 199
+kControlPlacardProc = 224
+kControlClockTimeProc = 240
+kControlClockTimeSecondsProc = 241
+kControlClockDateProc = 242
+kControlClockMonthYearProc = 243
+kControlClockNoFlags = 0
+kControlClockIsDisplayOnly = 1
+kControlClockIsLive = 2
+kControlClockLongDateTag = FOUR_CHAR_CODE('date')
+kControlClockFontStyleTag = kControlFontStyleTag
+kControlUserPaneProc = 256
+kControlUserItemDrawProcTag = FOUR_CHAR_CODE('uidp')
+kControlUserPaneDrawProcTag = FOUR_CHAR_CODE('draw')
+kControlUserPaneHitTestProcTag = FOUR_CHAR_CODE('hitt')
+kControlUserPaneTrackingProcTag = FOUR_CHAR_CODE('trak')
+kControlUserPaneIdleProcTag = FOUR_CHAR_CODE('idle')
+kControlUserPaneKeyDownProcTag = FOUR_CHAR_CODE('keyd')
+kControlUserPaneActivateProcTag = FOUR_CHAR_CODE('acti')
+kControlUserPaneFocusProcTag = FOUR_CHAR_CODE('foci')
+kControlUserPaneBackgroundProcTag = FOUR_CHAR_CODE('back')
+kControlEditTextProc = 272
+kControlEditTextDialogProc = 273
+kControlEditTextPasswordProc = 274
+kControlEditTextStyleTag = kControlFontStyleTag
+kControlEditTextTextTag = FOUR_CHAR_CODE('text')
+kControlEditTextTEHandleTag = FOUR_CHAR_CODE('than')
+kControlEditTextKeyFilterTag = kControlKeyFilterTag
+kControlEditTextSelectionTag = FOUR_CHAR_CODE('sele')
+kControlEditTextPasswordTag = FOUR_CHAR_CODE('pass')
+kControlStaticTextProc = 288
+kControlStaticTextStyleTag = kControlFontStyleTag
+kControlStaticTextTextTag = FOUR_CHAR_CODE('text')
+kControlStaticTextTextHeightTag = FOUR_CHAR_CODE('thei')
+kControlPictureProc = 304
+kControlPictureNoTrackProc = 305
+kControlIconProc = 320
+kControlIconNoTrackProc = 321
+kControlIconSuiteProc = 322
+kControlIconSuiteNoTrackProc = 323
+kControlIconTransformTag = FOUR_CHAR_CODE('trfm')
+kControlIconAlignmentTag = FOUR_CHAR_CODE('algn')
+kControlWindowHeaderProc = 336
+kControlWindowListViewHeaderProc = 337
+kControlListBoxProc = 352
+kControlListBoxAutoSizeProc = 353
+kControlListBoxListHandleTag = FOUR_CHAR_CODE('lhan')
+kControlListBoxKeyFilterTag = kControlKeyFilterTag
+kControlListBoxFontStyleTag = kControlFontStyleTag
+kControlListBoxDoubleClickTag = FOUR_CHAR_CODE('dblc')
+kControlPushButtonProc = 368
+kControlCheckBoxProc = 369
+kControlRadioButtonProc = 370
+kControlPushButLeftIconProc = 374
+kControlPushButRightIconProc = 375
+kControlPushButtonDefaultTag = FOUR_CHAR_CODE('dflt')
+kControlScrollBarProc = 384
+kControlScrollBarLiveProc = 386
+kControlPopupButtonProc = 400
+kControlPopupFixedWidthVariant = 1 << 0
+kControlPopupVariableWidthVariant = 1 << 1
+kControlPopupUseAddResMenuVariant = 1 << 2
+kControlPopupUseWFontVariant = 1 << 3
+kControlPopupButtonMenuHandleTag = FOUR_CHAR_CODE('mhan')
+kControlPopupButtonMenuIDTag = FOUR_CHAR_CODE('mnid')
+kControlRadioGroupProc = 416
+kControlNoVariant = 0
 kControlUsesOwningWindowsFontVariant = 1 << 3
 kControlNoPart = 0
 kControlLabelPart = 1
 kControlMenuPart = 2
 kControlTrianglePart = 4
+kControlEditTextPart = 5
+kControlPicturePart = 6
+kControlIconPart = 7
+kControlClockPart = 8
+kControlListBoxPart = 24
+kControlListBoxDoubleClickPart = 25
+kControlImageWellPart = 26
+kControlRadioGroupPart = 27
 kControlButtonPart = 10
 kControlCheckBoxPart = 11
 kControlRadioButtonPart = 11
@@ -20,9 +259,9 @@
 kControlIndicatorPart = 129
 kControlDisabledPart = 254
 kControlInactivePart = 255
-kControlCheckboxUncheckedValue = 0
-kControlCheckboxCheckedValue = 1
-kControlCheckboxMixedValue = 2
+kControlCheckBoxUncheckedValue = 0
+kControlCheckBoxCheckedValue = 1
+kControlCheckBoxMixedValue = 2
 kControlRadioButtonUncheckedValue = 0
 kControlRadioButtonCheckedValue = 1
 kControlRadioButtonMixedValue = 2
@@ -41,12 +280,9 @@
 popupTitleLeftJust = 0x00000000
 popupTitleCenterJust = 0x00000001
 popupTitleRightJust = 0x000000FF
+noConstraint = kNoConstraint
 hAxisOnly = 1
 vAxisOnly = 2
-cFrameColor = 0
-cBodyColor = 1
-cTextColor = 2
-cThumbColor = 3
 drawCntl = 0
 testCntl = 1
 calcCRgns = 2
@@ -63,27 +299,30 @@
 kDrawControlIndicatorOnly = 129
 kDragControlEntireControl = 0
 kDragControlIndicator = 1
-useWFont = 8
-inLabel = 1
-inMenu = 2
-inTriangle = 4
-inButton = 10
-inCheckBox = 11
-inUpButton = 20
-inDownButton = 21
-inPageUp = 22
-inPageDown = 23
-inThumb = 129
-kNoHiliteControlPart = 0
-kInLabelControlPart = 1
-kInMenuControlPart = 2
-kInTriangleControlPart = 4
-kInButtonControlPart = 10
-kInCheckBoxControlPart = 11
-kInUpButtonControlPart = 20
-kInDownButtonControlPart = 21
-kInPageUpControlPart = 22
-kInPageDownControlPart = 23
-kInIndicatorControlPart = 129
-kReservedControlPart = 254
-kControlInactiveControlPart = 255
+useWFont = popupUseWFont
+kControlCheckboxUncheckedValue = kControlCheckBoxUncheckedValue
+kControlCheckboxCheckedValue = kControlCheckBoxCheckedValue
+kControlCheckboxMixedValue = kControlCheckBoxMixedValue
+inLabel = kControlLabelPart
+inMenu = kControlMenuPart
+inTriangle = kControlTrianglePart
+inButton = kControlButtonPart
+inCheckBox = kControlCheckBoxPart
+inUpButton = kControlUpButtonPart
+inDownButton = kControlDownButtonPart
+inPageUp = kControlPageUpPart
+inPageDown = kControlPageDownPart
+inThumb = kControlIndicatorPart
+kNoHiliteControlPart = kControlNoPart
+kInLabelControlPart = kControlLabelPart
+kInMenuControlPart = kControlMenuPart
+kInTriangleControlPart = kControlTrianglePart
+kInButtonControlPart = kControlButtonPart
+kInCheckBoxControlPart = kControlCheckBoxPart
+kInUpButtonControlPart = kControlUpButtonPart
+kInDownButtonControlPart = kControlDownButtonPart
+kInPageUpControlPart = kControlPageUpPart
+kInPageDownControlPart = kControlPageDownPart
+kInIndicatorControlPart = kControlIndicatorPart
+kReservedControlPart = kControlDisabledPart
+kControlInactiveControlPart = kControlInactivePart
diff --git a/Mac/Lib/lib-toolbox/Dialogs.py b/Mac/Lib/lib-toolbox/Dialogs.py
index 893feda..477f001 100644
--- a/Mac/Lib/lib-toolbox/Dialogs.py
+++ b/Mac/Lib/lib-toolbox/Dialogs.py
@@ -1,5 +1,16 @@
 # Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Dialogs.h'
 
+kControlDialogItem = 4
+kButtonDialogItem = kControlDialogItem | 0
+kCheckBoxDialogItem = kControlDialogItem | 1
+kRadioButtonDialogItem = kControlDialogItem | 2
+kResourceControlDialogItem = kControlDialogItem | 3
+kStaticTextDialogItem = 8
+kEditTextDialogItem = 16
+kIconDialogItem = 32
+kPictureDialogItem = 64
+kUserDialogItem = 0
+kItemDisableBit = 128
 ctrlItem = 4
 btnCtrl = 0
 chkCtrl = 1
@@ -11,11 +22,40 @@
 picItem = 64
 userItem = 0
 itemDisable = 128
-ok = 1
-cancel = 2
-stopIcon = 0
-noteIcon = 1
-cautionIcon = 2
+kStdOkItemIndex = 1
+kStdCancelItemIndex = 2
+ok = kStdOkItemIndex
+cancel = kStdCancelItemIndex
+kStopIcon = 0
+kNoteIcon = 1
+kCautionIcon = 2
+stopIcon = kStopIcon
+noteIcon = kNoteIcon
+cautionIcon = kCautionIcon
+kOkItemIndex = 1
+kCancelItemIndex = 2
 overlayDITL = 0
 appendDITLRight = 1
 appendDITLBottom = 2
+kAlertStopAlert = 0
+kAlertNoteAlert = 1
+kAlertCautionAlert = 2
+kAlertPlainAlert = 3
+kAlertDefaultOKText = -1
+kAlertDefaultCancelText = -1
+kAlertDefaultOtherText = -1
+kAlertStdAlertOKButton = 1
+kAlertStdAlertCancelButton = 2
+kAlertStdAlertOtherButton = 3
+kAlertStdAlertHelpButton = 4
+kDialogFontNoFontStyle = 0
+kDialogFontUseFontMask = 0x0001
+kDialogFontUseFaceMask = 0x0002
+kDialogFontUseSizeMask = 0x0004
+kDialogFontUseForeColorMask = 0x0008
+kDialogFontUseBackColorMask = 0x0010
+kDialogFontUseModeMask = 0x0020
+kDialogFontUseJustMask = 0x0040
+kDialogFontUseAllMask = 0x00FF
+kDialogFontAddFontSizeMask = 0x0100
+kDialogFontUseFontNameMask = 0x0200
diff --git a/Mac/Lib/lib-toolbox/Events.py b/Mac/Lib/lib-toolbox/Events.py
index 7f66525..2e6eb9f 100644
--- a/Mac/Lib/lib-toolbox/Events.py
+++ b/Mac/Lib/lib-toolbox/Events.py
@@ -11,35 +11,24 @@
 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 @@
 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
diff --git a/Mac/Lib/lib-toolbox/Fonts.py b/Mac/Lib/lib-toolbox/Fonts.py
index 9823046..f19846c 100644
--- a/Mac/Lib/lib-toolbox/Fonts.py
+++ b/Mac/Lib/lib-toolbox/Fonts.py
@@ -2,31 +2,46 @@
 
 systemFont = 0
 applFont = 1
-newYork = 2
-geneva = 3
-monaco = 4
-venice = 5
-london = 6
-athens = 7
-sanFran = 8
-toronto = 9
-cairo = 11
-losAngeles = 12
-times = 20
-helvetica = 21
-courier = 22
-symbol = 23
-mobile = 24
+kFontIDNewYork = 2
+kFontIDGeneva = 3
+kFontIDMonaco = 4
+kFontIDVenice = 5
+kFontIDLondon = 6
+kFontIDAthens = 7
+kFontIDSanFrancisco = 8
+kFontIDToronto = 9
+kFontIDCairo = 11
+kFontIDLosAngeles = 12
+kFontIDTimes = 20
+kFontIDHelvetica = 21
+kFontIDCourier = 22
+kFontIDSymbol = 23
+kFontIDMobile = 24
+newYork = kFontIDNewYork
+geneva = kFontIDGeneva
+monaco = kFontIDMonaco
+venice = kFontIDVenice
+london = kFontIDLondon
+athens = kFontIDAthens
+sanFran = kFontIDSanFrancisco
+toronto = kFontIDToronto
+cairo = kFontIDCairo
+losAngeles = kFontIDLosAngeles
+times = kFontIDTimes
+helvetica = kFontIDHelvetica
+courier = kFontIDCourier
+symbol = kFontIDSymbol
+mobile = kFontIDMobile
 commandMark = 17
 checkMark = 18
 diamondMark = 19
 appleMark = 20
-propFont = 36864
-prpFntH = 36865
-prpFntW = 36866
-prpFntHW = 36867
-fixedFont = 45056
-fxdFntH = 45057
-fxdFntW = 45058
-fxdFntHW = 45059
-fontWid = 44208
+propFont = 36864L
+prpFntH = 36865L
+prpFntW = 36866L
+prpFntHW = 36867L
+fixedFont = 45056L
+fxdFntH = 45057L
+fxdFntW = 45058L
+fxdFntHW = 45059L
+fontWid = 44208L
diff --git a/Mac/Lib/lib-toolbox/Menus.py b/Mac/Lib/lib-toolbox/Menus.py
index e33f81b..5660240 100644
--- a/Mac/Lib/lib-toolbox/Menus.py
+++ b/Mac/Lib/lib-toolbox/Menus.py
@@ -1,5 +1,15 @@
 # Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Menus.h'
 
+kMenuStdMenuProc = 63
+kMenuStdMenuBarProc = 63
+kMenuNoModifiers = 0
+kMenuNoIcon = 0
+kMenuIconType = 1
+kMenuShrinkIconType = 2
+kMenuSmallIconType = 3
+kMenuColorIconType = 4
+kMenuIconSuiteType = 5
+kMenuIconRefType = 6
 noMark = 0
 mDrawMsg = 0
 mChooseMsg = 1
diff --git a/Mac/Lib/lib-toolbox/QuickDraw.py b/Mac/Lib/lib-toolbox/QuickDraw.py
index dc8b002..67394b0 100644
--- a/Mac/Lib/lib-toolbox/QuickDraw.py
+++ b/Mac/Lib/lib-toolbox/QuickDraw.py
@@ -19,6 +19,7 @@
 notPatBic = 15
 grayishTextOr = 49
 hilitetransfermode = 50
+hilite = 50
 blend = 32
 addPin = 33
 addOver = 34
@@ -84,6 +85,14 @@
 kQDGrafVerbErase = 2
 kQDGrafVerbInvert = 3
 kQDGrafVerbFill = 4
+frame = kQDGrafVerbFrame
+paint = kQDGrafVerbPaint
+erase = kQDGrafVerbErase
+invert = kQDGrafVerbInvert
+fill = kQDGrafVerbFill
+chunky = 0
+chunkyPlanar = 1
+planar = 2
 singleDevicesBit = 0
 dontMatchSeedsBit = 1
 allDevicesBit = 2
@@ -99,7 +108,7 @@
 
 leftCaret = 0
 rightCaret = -1
-hilite = 1
+kHilite = 1
 smLeftCaret = 0
 smRightCaret = -1
 smHilite = 1
diff --git a/Mac/Lib/lib-toolbox/QuickTime.py b/Mac/Lib/lib-toolbox/QuickTime.py
index 078ae1d..3460d08 100644
--- a/Mac/Lib/lib-toolbox/QuickTime.py
+++ b/Mac/Lib/lib-toolbox/QuickTime.py
@@ -1,23 +1,24 @@
-# Generated from 'sap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Movies.h'
+# Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Movies.h'
 
-MovieFileType = 'MooV'
-MediaHandlerType = 'mhlr'
-DataHandlerType = 'dhlr'
-VideoMediaType = 'vide'
-SoundMediaType = 'soun'
-TextMediaType = 'text'
-BaseMediaType = 'gnrc'
-MPEGMediaType = 'MPEG'
-MusicMediaType = 'musi'
-TimeCodeMediaType = 'tmcd'
-SpriteMediaType = 'sprt'
-TweenMediaType = 'twen'
-ThreeDeeMediaType = 'qd3d'
-HandleDataHandlerSubType = 'hndl'
-ResourceDataHandlerSubType = 'rsrc'
-VisualMediaCharacteristic = 'eyes'
-AudioMediaCharacteristic = 'ears'
-kCharacteristicCanSendVideo = 'vsnd'
+def FOUR_CHAR_CODE(x): return x
+MovieFileType = FOUR_CHAR_CODE('MooV')
+MediaHandlerType = FOUR_CHAR_CODE('mhlr')
+DataHandlerType = FOUR_CHAR_CODE('dhlr')
+VideoMediaType = FOUR_CHAR_CODE('vide')
+SoundMediaType = FOUR_CHAR_CODE('soun')
+TextMediaType = FOUR_CHAR_CODE('text')
+BaseMediaType = FOUR_CHAR_CODE('gnrc')
+MPEGMediaType = FOUR_CHAR_CODE('MPEG')
+MusicMediaType = FOUR_CHAR_CODE('musi')
+TimeCodeMediaType = FOUR_CHAR_CODE('tmcd')
+SpriteMediaType = FOUR_CHAR_CODE('sprt')
+TweenMediaType = FOUR_CHAR_CODE('twen')
+ThreeDeeMediaType = FOUR_CHAR_CODE('qd3d')
+HandleDataHandlerSubType = FOUR_CHAR_CODE('hndl')
+ResourceDataHandlerSubType = FOUR_CHAR_CODE('rsrc')
+VisualMediaCharacteristic = FOUR_CHAR_CODE('eyes')
+AudioMediaCharacteristic = FOUR_CHAR_CODE('ears')
+kCharacteristicCanSendVideo = FOUR_CHAR_CODE('vsnd')
 DoTheRightThing = 0
 kMusicFlagDontPlay2Soft = 1L << 0
 dfDontDisplay = 1 << 0
@@ -41,9 +42,9 @@
 searchTextDontHiliteFoundText = 1L << 17
 searchTextOneTrackOnly = 1L << 18
 searchTextEnabledTracksOnly = 1L << 19
-k3DMediaRendererEntry = 'rend'
-k3DMediaRendererName = 'name'
-k3DMediaRendererCode = 'rcod'
+k3DMediaRendererEntry = FOUR_CHAR_CODE('rend')
+k3DMediaRendererName = FOUR_CHAR_CODE('name')
+k3DMediaRendererCode = FOUR_CHAR_CODE('rcod')
 movieProgressOpen = 0
 movieProgressUpdatePercent = 1
 movieProgressClose = 2
@@ -72,6 +73,9 @@
 triggerRateLT = 0x0004
 triggerRateGT = 0x0008
 triggerRateEqual = 0x0010
+triggerRateLTE = triggerRateLT | triggerRateEqual
+triggerRateGTE = triggerRateGT | triggerRateEqual
+triggerRateNotEqual = triggerRateGT | triggerRateEqual | triggerRateLT
 triggerRateChange = 0
 triggerAtStart = 0x0001
 triggerAtStop = 0x0002
@@ -170,20 +174,20 @@
 kParentAtomIsContainer = 0
 kITextRemoveEverythingBut = 0 << 1
 kITextRemoveLeaveSuggestedAlternate = 1 << 1
-kITextAtomType = 'itxt'
-kITextStringAtomType = 'text'
+kITextAtomType = FOUR_CHAR_CODE('itxt')
+kITextStringAtomType = FOUR_CHAR_CODE('text')
 kTrackModifierInput = 0x696E
 kTrackModifierType = 0x7479
-kTrackModifierReference = 'ssrc'
-kTrackModifierObjectID = 'obid'
-kTrackModifierInputName = 'name'
-kInputMapSubInputID = 'subi'
+kTrackModifierReference = FOUR_CHAR_CODE('ssrc')
+kTrackModifierObjectID = FOUR_CHAR_CODE('obid')
+kTrackModifierInputName = FOUR_CHAR_CODE('name')
+kInputMapSubInputID = FOUR_CHAR_CODE('subi')
 kTrackModifierTypeMatrix = 1
 kTrackModifierTypeClip = 2
 kTrackModifierTypeGraphicsMode = 5
 kTrackModifierTypeVolume = 3
 kTrackModifierTypeBalance = 4
-kTrackModifierTypeSpriteImage = 'vide'
+kTrackModifierTypeImage = FOUR_CHAR_CODE('vide')
 kTrackModifierObjectMatrix = 6
 kTrackModifierObjectGraphicsMode = 7
 kTrackModifierType3d4x4Matrix = 8
@@ -198,24 +202,24 @@
 kTweenTypeMatrix = 7
 kTweenTypeRGBColor = 8
 kTweenTypeGraphicsModeWithRGBColor = 9
-kTweenType3dScale = '3sca'
-kTweenType3dTranslate = '3tra'
-kTweenType3dRotate = '3rot'
-kTweenType3dRotateAboutPoint = '3rap'
-kTweenType3dRotateAboutAxis = '3rax'
-kTweenType3dQuaternion = '3qua'
-kTweenType3dMatrix = '3mat'
-kTweenType3dCameraData = '3cam'
-kTweenType3dSoundLocalizationData = '3slc'
-kTweenEntry = 'twen'
-kTweenData = 'data'
-kTweenType = 'twnt'
-kTweenStartOffset = 'twst'
-kTweenDuration = 'twdu'
-kTween3dInitialCondition = 'icnd'
-kTweenInterpolationStyle = 'isty'
-kTweenRegionData = 'qdrg'
-kTweenPictureData = 'PICT'
+kTweenType3dScale = FOUR_CHAR_CODE('3sca')
+kTweenType3dTranslate = FOUR_CHAR_CODE('3tra')
+kTweenType3dRotate = FOUR_CHAR_CODE('3rot')
+kTweenType3dRotateAboutPoint = FOUR_CHAR_CODE('3rap')
+kTweenType3dRotateAboutAxis = FOUR_CHAR_CODE('3rax')
+kTweenType3dQuaternion = FOUR_CHAR_CODE('3qua')
+kTweenType3dMatrix = FOUR_CHAR_CODE('3mat')
+kTweenType3dCameraData = FOUR_CHAR_CODE('3cam')
+kTweenType3dSoundLocalizationData = FOUR_CHAR_CODE('3slc')
+kTweenEntry = FOUR_CHAR_CODE('twen')
+kTweenData = FOUR_CHAR_CODE('data')
+kTweenType = FOUR_CHAR_CODE('twnt')
+kTweenStartOffset = FOUR_CHAR_CODE('twst')
+kTweenDuration = FOUR_CHAR_CODE('twdu')
+kTween3dInitialCondition = FOUR_CHAR_CODE('icnd')
+kTweenInterpolationStyle = FOUR_CHAR_CODE('isty')
+kTweenRegionData = FOUR_CHAR_CODE('qdrg')
+kTweenPictureData = FOUR_CHAR_CODE('PICT')
 internalComponentErr = -2070
 notImplementedMusicOSErr = -2071
 cantSendToSynthesizerOSErr = -2072
@@ -243,17 +247,17 @@
 findTextReverseSearch = 1 << 2
 findTextWrapAround = 1 << 3
 findTextUseOffset = 1 << 4
-dropShadowOffsetType = 'drpo'
-dropShadowTranslucencyType = 'drpt'
+dropShadowOffsetType = FOUR_CHAR_CODE('drpo')
+dropShadowTranslucencyType = FOUR_CHAR_CODE('drpt')
 spriteHitTestBounds = 1L << 0
 spriteHitTestImage = 1L << 1
-kSpriteAtomType = 'sprt'
-kSpriteImagesContainerAtomType = 'imct'
-kSpriteImageAtomType = 'imag'
-kSpriteImageDataAtomType = 'imda'
-kSpriteSharedDataAtomType = 'dflt'
-kSpriteNameAtomType = 'name'
-MovieControllerComponentType = 'play'
+kSpriteAtomType = FOUR_CHAR_CODE('sprt')
+kSpriteImagesContainerAtomType = FOUR_CHAR_CODE('imct')
+kSpriteImageAtomType = FOUR_CHAR_CODE('imag')
+kSpriteImageDataAtomType = FOUR_CHAR_CODE('imda')
+kSpriteSharedDataAtomType = FOUR_CHAR_CODE('dflt')
+kSpriteNameAtomType = FOUR_CHAR_CODE('name')
+MovieControllerComponentType = FOUR_CHAR_CODE('play')
 mcActionIdle = 1
 mcActionDraw = 2
 mcActionActivate = 3
diff --git a/Mac/Lib/lib-toolbox/Sound.py b/Mac/Lib/lib-toolbox/Sound.py
index f782dd5..f4e756e 100644
--- a/Mac/Lib/lib-toolbox/Sound.py
+++ b/Mac/Lib/lib-toolbox/Sound.py
@@ -1,10 +1,10 @@
 # Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Sound.h'
 
-soundListRsrc = 'snd '
-rate44khz = 0xAC440000L
-rate22050hz = 0x56220000L
-rate22khz = 0x56EE8BA3L
-rate11khz = 0x2B7745D1L
+def FOUR_CHAR_CODE(x): return x
+soundListRsrc = FOUR_CHAR_CODE('snd ')
+rate22050hz = 0x56220000
+rate22khz = 0x56EE8BA3
+rate11khz = 0x2B7745D1
 rate11025hz = 0x2B110000
 squareWaveSynth = 1
 waveTableSynth = 3
@@ -15,6 +15,30 @@
 kSimpleBeepID = 1
 kFullVolume = 0x0100
 kNoVolume = 0
+stdQLength = 128
+dataOffsetFlag = 0x8000
+kUseOptionalOutputDevice = -1
+notCompressed = 0
+fixedCompression = -1
+variableCompression = -2
+twoToOne = 1
+eightToThree = 2
+threeToOne = 3
+sixToOne = 4
+sixToOnePacketSize = 8
+threeToOnePacketSize = 16
+stateBlockSize = 64
+leftOverBlockSize = 32
+firstSoundFormat = 0x0001
+secondSoundFormat = 0x0002
+dbBufferReady = 0x00000001
+dbLastBuffer = 0x00000004
+sysBeepDisable = 0x0000
+unitTypeNoSelection = 0xFFFF
+unitTypeSeconds = 0x0000
+stdSH = 0x00
+extSH = 0xFF
+cmpSH = 0xFE
 nullCmd = 0
 initCmd = 1
 freeCmd = 2
@@ -38,6 +62,8 @@
 getAmpCmd = 45
 volumeCmd = 46
 getVolumeCmd = 47
+clockComponentCmd = 50
+getClockComponentCmd = 51
 waveTableCmd = 60
 phaseCmd = 61
 soundCmd = 80
@@ -50,13 +76,24 @@
 getRateMultiplierCmd = 87
 sizeCmd = 90
 convertCmd = 91
-stdQLength = 128
-dataOffsetFlag = 0x8000
 waveInitChannelMask = 0x07
 waveInitChannel0 = 0x04
 waveInitChannel1 = 0x05
 waveInitChannel2 = 0x06
 waveInitChannel3 = 0x07
+initChan0 = waveInitChannel0
+initChan1 = waveInitChannel1
+initChan2 = waveInitChannel2
+initChan3 = waveInitChannel3
+outsideCmpSH = 0
+insideCmpSH = 1
+aceSuccess = 0
+aceMemFull = 1
+aceNilBlock = 2
+aceBadComp = 3
+aceBadEncode = 4
+aceBadDest = 5
+aceBadCmd = 6
 initChanLeft = 0x0002
 initChanRight = 0x0003
 initNoInterp = 0x0004
@@ -69,34 +106,160 @@
 initSRateMask = 0x0030
 initStereoMask = 0x00C0
 initCompMask = 0xFF00
-kUseOptionalOutputDevice = -1
-notCompressed = 0
-fixedCompression = -1
-variableCompression = -2
-twoToOne = 1
-eightToThree = 2
-threeToOne = 3
-sixToOne = 4
-stdSH = 0x00
-extSH = 0xFF
-cmpSH = 0xFE
-outsideCmpSH = 0
-insideCmpSH = 1
-aceSuccess = 0
-aceMemFull = 1
-aceNilBlock = 2
-aceBadComp = 3
-aceBadEncode = 4
-aceBadDest = 5
-aceBadCmd = 6
-sixToOnePacketSize = 8
-threeToOnePacketSize = 16
-stateBlockSize = 64
-leftOverBlockSize = 32
-firstSoundFormat = 0x0001
-secondSoundFormat = 0x0002
-dbBufferReady = 0x00000001
-dbLastBuffer = 0x00000004
-sysBeepDisable = 0x0000
-unitTypeNoSelection = 0xFFFF
-unitTypeSeconds = 0x0000
+siActiveChannels = FOUR_CHAR_CODE('chac')
+siActiveLevels = FOUR_CHAR_CODE('lmac')
+siAGCOnOff = FOUR_CHAR_CODE('agc ')
+siAsync = FOUR_CHAR_CODE('asyn')
+siAVDisplayBehavior = FOUR_CHAR_CODE('avdb')
+siChannelAvailable = FOUR_CHAR_CODE('chav')
+siCompressionAvailable = FOUR_CHAR_CODE('cmav')
+siCompressionFactor = FOUR_CHAR_CODE('cmfa')
+siCompressionHeader = FOUR_CHAR_CODE('cmhd')
+siCompressionNames = FOUR_CHAR_CODE('cnam')
+siCompressionParams = FOUR_CHAR_CODE('cmpp')
+siCompressionType = FOUR_CHAR_CODE('comp')
+siContinuous = FOUR_CHAR_CODE('cont')
+siDeviceBufferInfo = FOUR_CHAR_CODE('dbin')
+siDeviceConnected = FOUR_CHAR_CODE('dcon')
+siDeviceIcon = FOUR_CHAR_CODE('icon')
+siDeviceName = FOUR_CHAR_CODE('name')
+siHardwareBalance = FOUR_CHAR_CODE('hbal')
+siHardwareBalanceSteps = FOUR_CHAR_CODE('hbls')
+siHardwareBass = FOUR_CHAR_CODE('hbas')
+siHardwareBassSteps = FOUR_CHAR_CODE('hbst')
+siHardwareBusy = FOUR_CHAR_CODE('hwbs')
+siHardwareFormat = FOUR_CHAR_CODE('hwfm')
+siHardwareMute = FOUR_CHAR_CODE('hmut')
+siHardwareTreble = FOUR_CHAR_CODE('htrb')
+siHardwareTrebleSteps = FOUR_CHAR_CODE('hwts')
+siHardwareVolume = FOUR_CHAR_CODE('hvol')
+siHardwareVolumeSteps = FOUR_CHAR_CODE('hstp')
+siHeadphoneMute = FOUR_CHAR_CODE('pmut')
+siHeadphoneVolume = FOUR_CHAR_CODE('pvol')
+siHeadphoneVolumeSteps = FOUR_CHAR_CODE('hdst')
+siInputAvailable = FOUR_CHAR_CODE('inav')
+siInputGain = FOUR_CHAR_CODE('gain')
+siInputSource = FOUR_CHAR_CODE('sour')
+siInputSourceNames = FOUR_CHAR_CODE('snam')
+siLevelMeterOnOff = FOUR_CHAR_CODE('lmet')
+siModemGain = FOUR_CHAR_CODE('mgai')
+siMonitorAvailable = FOUR_CHAR_CODE('mnav')
+siMonitorSource = FOUR_CHAR_CODE('mons')
+siNumberChannels = FOUR_CHAR_CODE('chan')
+siOptionsDialog = FOUR_CHAR_CODE('optd')
+siPlayThruOnOff = FOUR_CHAR_CODE('plth')
+siPostMixerSoundComponent = FOUR_CHAR_CODE('psmx')
+siPreMixerSoundComponent = FOUR_CHAR_CODE('prmx')
+siQuality = FOUR_CHAR_CODE('qual')
+siRateMultiplier = FOUR_CHAR_CODE('rmul')
+siRecordingQuality = FOUR_CHAR_CODE('qual')
+siSampleRate = FOUR_CHAR_CODE('srat')
+siSampleRateAvailable = FOUR_CHAR_CODE('srav')
+siSampleSize = FOUR_CHAR_CODE('ssiz')
+siSampleSizeAvailable = FOUR_CHAR_CODE('ssav')
+siSetupCDAudio = FOUR_CHAR_CODE('sucd')
+siSetupModemAudio = FOUR_CHAR_CODE('sumd')
+siSlopeAndIntercept = FOUR_CHAR_CODE('flap')
+siSoundClock = FOUR_CHAR_CODE('sclk')
+siSpeakerMute = FOUR_CHAR_CODE('smut')
+siSpeakerVolume = FOUR_CHAR_CODE('svol')
+siSSpCPULoadLimit = FOUR_CHAR_CODE('3dll')
+siSSpLocalization = FOUR_CHAR_CODE('3dif')
+siSSpSpeakerSetup = FOUR_CHAR_CODE('3dst')
+siStereoInputGain = FOUR_CHAR_CODE('sgai')
+siSubwooferMute = FOUR_CHAR_CODE('bmut')
+siTwosComplementOnOff = FOUR_CHAR_CODE('twos')
+siVolume = FOUR_CHAR_CODE('volu')
+siVoxRecordInfo = FOUR_CHAR_CODE('voxr')
+siVoxStopInfo = FOUR_CHAR_CODE('voxs')
+siWideStereo = FOUR_CHAR_CODE('wide')
+siCloseDriver = FOUR_CHAR_CODE('clos')
+siInitializeDriver = FOUR_CHAR_CODE('init')
+siPauseRecording = FOUR_CHAR_CODE('paus')
+siUserInterruptProc = FOUR_CHAR_CODE('user')
+kNoSoundComponentType = FOUR_CHAR_CODE('****')
+kSoundComponentType = FOUR_CHAR_CODE('sift')
+kSoundComponentPPCType = FOUR_CHAR_CODE('nift')
+kRate8SubType = FOUR_CHAR_CODE('ratb')
+kRate16SubType = FOUR_CHAR_CODE('ratw')
+kConverterSubType = FOUR_CHAR_CODE('conv')
+kSndSourceSubType = FOUR_CHAR_CODE('sour')
+kMixerType = FOUR_CHAR_CODE('mixr')
+kMixer8SubType = FOUR_CHAR_CODE('mixb')
+kMixer16SubType = FOUR_CHAR_CODE('mixw')
+kSoundOutputDeviceType = FOUR_CHAR_CODE('sdev')
+kClassicSubType = FOUR_CHAR_CODE('clas')
+kASCSubType = FOUR_CHAR_CODE('asc ')
+kDSPSubType = FOUR_CHAR_CODE('dsp ')
+kAwacsSubType = FOUR_CHAR_CODE('awac')
+kGCAwacsSubType = FOUR_CHAR_CODE('awgc')
+kSingerSubType = FOUR_CHAR_CODE('sing')
+kSinger2SubType = FOUR_CHAR_CODE('sng2')
+kWhitSubType = FOUR_CHAR_CODE('whit')
+kSoundBlasterSubType = FOUR_CHAR_CODE('sbls')
+kSoundCompressor = FOUR_CHAR_CODE('scom')
+kSoundDecompressor = FOUR_CHAR_CODE('sdec')
+kSoundEffectsType = FOUR_CHAR_CODE('snfx')
+kSSpLocalizationSubType = FOUR_CHAR_CODE('snd3')
+kSoundNotCompressed = FOUR_CHAR_CODE('NONE')
+kOffsetBinary = FOUR_CHAR_CODE('raw ')
+kMACE3Compression = FOUR_CHAR_CODE('MAC3')
+kMACE6Compression = FOUR_CHAR_CODE('MAC6')
+kCDXA4Compression = FOUR_CHAR_CODE('cdx4')
+kCDXA2Compression = FOUR_CHAR_CODE('cdx2')
+kIMACompression = FOUR_CHAR_CODE('ima4')
+kULawCompression = FOUR_CHAR_CODE('ulaw')
+kALawCompression = FOUR_CHAR_CODE('alaw')
+kLittleEndianFormat = FOUR_CHAR_CODE('sowt')
+kFloat32Format = FOUR_CHAR_CODE('fl32')
+kFloat64Format = FOUR_CHAR_CODE('fl64')
+kTwosComplement = FOUR_CHAR_CODE('twos')
+kInputMask = 0x000000FF
+kOutputMask = 0x0000FF00
+kOutputShift = 8
+kActionMask = 0x00FF0000
+kSoundComponentBits = 0x00FFFFFF
+kAVDisplayHeadphoneRemove = 0
+kAVDisplayHeadphoneInsert = 1
+kAVDisplayPlainTalkRemove = 2
+kAVDisplayPlainTalkInsert = 3
+audioAllChannels = 0
+audioLeftChannel = 1
+audioRightChannel = 2
+audioUnmuted = 0
+audioMuted = 1
+siCDQuality = FOUR_CHAR_CODE('cd  ')
+siBestQuality = FOUR_CHAR_CODE('best')
+siBetterQuality = FOUR_CHAR_CODE('betr')
+siGoodQuality = FOUR_CHAR_CODE('good')
+siDeviceIsConnected = 1
+siDeviceNotConnected = 0
+siDontKnowIfConnected = -1
+siReadPermission = 0
+siWritePermission = 1
+kSoundComponentInitOutputDeviceSelect = 1
+kSoundComponentSetSourceSelect = 2
+kSoundComponentGetSourceSelect = 3
+kSoundComponentGetSourceDataSelect = 4
+kSoundComponentSetOutputSelect = 5
+kDelegatedSoundComponentSelectors = 0x0100
+kSoundComponentAddSourceSelect = kDelegatedSoundComponentSelectors + 1
+kSoundComponentRemoveSourceSelect = kDelegatedSoundComponentSelectors + 2
+kSoundComponentGetInfoSelect = kDelegatedSoundComponentSelectors + 3
+kSoundComponentSetInfoSelect = kDelegatedSoundComponentSelectors + 4
+kSoundComponentStartSourceSelect = kDelegatedSoundComponentSelectors + 5
+kSoundComponentStopSourceSelect = kDelegatedSoundComponentSelectors + 6
+kSoundComponentPauseSourceSelect = kDelegatedSoundComponentSelectors + 7
+kSoundComponentPlaySourceBufferSelect = kDelegatedSoundComponentSelectors + 8
+kAudioGetVolumeSelect = 0
+kAudioSetVolumeSelect = 1
+kAudioGetMuteSelect = 2
+kAudioSetMuteSelect = 3
+kAudioSetToDefaultsSelect = 4
+kAudioGetInfoSelect = 5
+kAudioGetBassSelect = 6
+kAudioSetBassSelect = 7
+kAudioGetTrebleSelect = 8
+kAudioSetTrebleSelect = 9
+kAudioGetOutputDeviceSelect = 10
+kAudioMuteOnEventSelect = 129
diff --git a/Mac/Lib/lib-toolbox/TextEdit.py b/Mac/Lib/lib-toolbox/TextEdit.py
index 6bfb163..6e98be3 100644
--- a/Mac/Lib/lib-toolbox/TextEdit.py
+++ b/Mac/Lib/lib-toolbox/TextEdit.py
@@ -14,7 +14,6 @@
 clrBit = 3
 addSizeBit = 4
 toggleBit = 5
-toglBit = 5
 doFont = 1
 doFace = 2
 doSize = 4
@@ -34,12 +33,14 @@
 intHitTestHook = 3
 intNWidthHook = 6
 intTextWidthHook = 7
+intInlineInputTSMTEPreUpdateHook = 8
+intInlineInputTSMTEPostUpdateHook = 9
 teFAutoScroll = 0
-teFAutoScr = 0
 teFTextBuffering = 1
 teFOutlineHilite = 2
 teFInlineInput = 3
-teFUseTextServices = 4
+teFUseInlineInput = 5
+teFInlineInputAutoScroll = 6
 teBitClear = 0
 teBitSet = 1
 teBitTest = -1
@@ -51,6 +52,4 @@
 teHighlight = 1
 teDraw = -1
 teCaret = -2
-TEBitClear = 0
-TEBitSet = 1
-TEBitTest = -1
+teFUseTextServices = 4
diff --git a/Mac/Lib/lib-toolbox/Windows.py b/Mac/Lib/lib-toolbox/Windows.py
index 7f54a24..603f7a8 100644
--- a/Mac/Lib/lib-toolbox/Windows.py
+++ b/Mac/Lib/lib-toolbox/Windows.py
@@ -1,11 +1,17 @@
-# Generated from 'Moes:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Windows.h'
+# Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:MacWindows.h'
 
-kWindowDefProcType = 'WDEF'
+def FOUR_CHAR_CODE(x): return x
+kWindowDefProcType = FOUR_CHAR_CODE('WDEF')
 kStandardWindowDefinition = 0
 kRoundWindowDefinition = 1
 kFloatingWindowDefinition = 124
+kDocumentWindowVariantCode = 0
 kModalDialogVariantCode = 1
+kPlainDialogVariantCode = 2
+kShadowDialogVariantCode = 3
 kMovableModalDialogVariantCode = 5
+kAlertVariantCode = 7
+kMovableAlertVariantCode = 9
 kSideFloaterVariantCode = 8
 documentProc = 0
 dBoxProc = 1
@@ -24,11 +30,66 @@
 floatSideGrowProc = 1995
 floatSideZoomProc = 1997
 floatSideZoomGrowProc = 1999
+kWindowDocumentDefProcResID = 64
+kWindowDialogDefProcResID = 65
+kWindowUtilityDefProcResID = 66
+kWindowUtilitySideTitleDefProcResID = 67
+kWindowDocumentProc = 1024
+kWindowGrowDocumentProc = 1025
+kWindowVertZoomDocumentProc = 1026
+kWindowVertZoomGrowDocumentProc = 1027
+kWindowHorizZoomDocumentProc = 1028
+kWindowHorizZoomGrowDocumentProc = 1029
+kWindowFullZoomDocumentProc = 1030
+kWindowFullZoomGrowDocumentProc = 1031
+kWindowPlainDialogProc = 1040
+kWindowShadowDialogProc = 1041
+kWindowModalDialogProc = 1042
+kWindowMovableModalDialogProc = 1043
+kWindowAlertProc = 1044
+kWindowMovableAlertProc = 1045
+kWindowFloatProc = 1057
+kWindowFloatGrowProc = 1059
+kWindowFloatVertZoomProc = 1061
+kWindowFloatVertZoomGrowProc = 1063
+kWindowFloatHorizZoomProc = 1065
+kWindowFloatHorizZoomGrowProc = 1067
+kWindowFloatFullZoomProc = 1069
+kWindowFloatFullZoomGrowProc = 1071
+kWindowFloatSideProc = 1073
+kWindowFloatSideGrowProc = 1075
+kWindowFloatSideVertZoomProc = 1077
+kWindowFloatSideVertZoomGrowProc = 1079
+kWindowFloatSideHorizZoomProc = 1081
+kWindowFloatSideHorizZoomGrowProc = 1083
+kWindowFloatSideFullZoomProc = 1085
+kWindowFloatSideFullZoomGrowProc = 1087
+kWindowNoPosition = 0x00000000
+kWindowDefaultPosition = 0x0000
+kWindowCenterMainScreen = 0x280A
+kWindowAlertPositionMainScreen = 0x300A
+kWindowStaggerMainScreen = 0x380A
+kWindowCenterParentWindow = 0xA80A
+kWindowAlertPositionParentWindow = 0xB00A
+kWindowStaggerParentWindow = 0xB80A
+kWindowCenterParentWindowScreen = 0x680A
+kWindowAlertPositionParentWindowScreen = 0x700A
+kWindowStaggerParentWindowScreen = 0x780A
+kWindowTitleBarRgn = 0
+kWindowTitleTextRgn = 1
+kWindowCloseBoxRgn = 2
+kWindowZoomBoxRgn = 3
+kWindowDragRgn = 5
+kWindowGrowRgn = 6
+kWindowCollapseBoxRgn = 7
+kWindowStructureRgn = 32
+kWindowContentRgn = 33
 dialogKind = 2
 userKind = 8
 kDialogWindowKind = 2
 kApplicationWindowKind = 8
 inDesk = 0
+inNoWindow = 0
 inMenuBar = 1
 inSysWindow = 2
 inContent = 3
@@ -37,6 +98,24 @@
 inGoAway = 6
 inZoomIn = 7
 inZoomOut = 8
+inCollapseBox = 11
+wNoHit = 0
+wInContent = 1
+wInDrag = 2
+wInGrow = 3
+wInGoAway = 4
+wInZoomIn = 5
+wInZoomOut = 6
+wInCollapseBox = 9
+kWindowMsgDraw = 0
+kWindowMsgHitTest = 1
+kWindowMsgCalculateShape = 2
+kWindowMsgInitialize = 3
+kWindowMsgCleanUp = 4
+kWindowMsgDrawGrowOutline = 5
+kWindowMsgDrawGrowBox = 6
+kWindowMsgGetFeatures = 7
+kWindowMsgGetRegion = 8
 wDraw = 0
 wHit = 1
 wCalcRgns = 2
@@ -45,15 +124,9 @@
 wGrow = 5
 wDrawGIcon = 6
 deskPatID = 16
-wNoHit = 0
-wInContent = 1
-wInDrag = 2
-wInGrow = 3
-wInGoAway = 4
-wInZoomIn = 5
-wInZoomOut = 6
 wContentColor = 0
 wFrameColor = 1
 wTextColor = 2
 wHiliteColor = 3
 wTitleBarColor = 4
+kLastWindowOfClass = 0
diff --git a/Mac/Lib/lib-toolbox/aetools.py b/Mac/Lib/lib-toolbox/aetools.py
index 59e0e0c..5a8d314 100644
--- a/Mac/Lib/lib-toolbox/aetools.py
+++ b/Mac/Lib/lib-toolbox/aetools.py
@@ -151,7 +151,6 @@
 		
 	def start(self):
 		"""Start the application, if it is not running yet"""
-		self.send_flags = AppleEvents.kAENoReply
 		_launch(self.target_signature)
 			
 	def newevent(self, code, subcode, parameters = {}, attributes = {}):