From 5ae5fdf9011a1e477dd3cfd4e666c0ef1e1ec816 Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Mon, 17 Jul 1995 11:40:10 +0000 Subject: Generated anew after fixing aescan.py --- Mac/Lib/toolbox/AEObjects.py | 61 ++++++ Mac/Lib/toolbox/AERegistry.py | 438 ++++++++++++++++++++++++++++++++++++++++++ Mac/Modules/ae/AEmodule.c | 149 +++++++------- Mac/Modules/ae/aegen.py | 18 +- 4 files changed, 581 insertions(+), 85 deletions(-) create mode 100644 Mac/Lib/toolbox/AEObjects.py create mode 100644 Mac/Lib/toolbox/AERegistry.py diff --git a/Mac/Lib/toolbox/AEObjects.py b/Mac/Lib/toolbox/AEObjects.py new file mode 100644 index 0000000..3f36414 --- /dev/null +++ b/Mac/Lib/toolbox/AEObjects.py @@ -0,0 +1,61 @@ +# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f: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' +kAEIDoMinimum = 0x0000 +kAEIDoWhose = 0x0001 +kAEIDoMarking = 0x0004 +kAEPassSubDescs = 0x0008 +kAEResolveNestedLists = 0x0010 +kAEHandleSimpleRanges = 0x0020 +kAEUseRelativeIterators = 0x0040 +typeWhoseDescriptor = 'whos' +formWhose = 'whos' +typeWhoseRange = 'wrng' +keyAEWhoseRangeStart = 'wstr' +keyAEWhoseRangeStop = 'wstp' +keyAEIndex = 'kidx' +keyAETest = 'ktst' diff --git a/Mac/Lib/toolbox/AERegistry.py b/Mac/Lib/toolbox/AERegistry.py new file mode 100644 index 0000000..217e4b9 --- /dev/null +++ b/Mac/Lib/toolbox/AERegistry.py @@ -0,0 +1,438 @@ +# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f: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' +kBySmallIcon = 0 +kByIconView = 1 +kByNameView = 2 +kByDateView = 3 +kBySizeView = 4 +kByKindView = 5 +kByCommentView = 6 +kByLabelView = 7 +kByVersionView = 8 +kAEInfo = 11 +kAEMain = 0 +kAESharing = 13 +kAEZoomIn = 7 +kAEZoomOut = 8 diff --git a/Mac/Modules/ae/AEmodule.c b/Mac/Modules/ae/AEmodule.c index 6bb9dfb..53467e4 100644 --- a/Mac/Modules/ae/AEmodule.c +++ b/Mac/Modules/ae/AEmodule.c @@ -164,6 +164,55 @@ static PyObject *AEDesc_AECountItems(_self, _args) return _res; } +static PyObject *AEDesc_AEPutPtr(_self, _args) + AEDescObject *_self; + PyObject *_args; +{ + PyObject *_res = NULL; + OSErr _err; + long index; + DescType typeCode; + char *dataPtr__in__; + long dataPtr__len__; + int dataPtr__in_len__; + if (!PyArg_ParseTuple(_args, "lO&s#", + &index, + PyMac_GetOSType, &typeCode, + &dataPtr__in__, &dataPtr__in_len__)) + return NULL; + dataPtr__len__ = dataPtr__in_len__; + _err = AEPutPtr(&_self->ob_itself, + index, + typeCode, + dataPtr__in__, dataPtr__len__); + if (_err != noErr) return PyMac_Error(_err); + Py_INCREF(Py_None); + _res = Py_None; + dataPtr__error__: ; + return _res; +} + +static PyObject *AEDesc_AEPutDesc(_self, _args) + AEDescObject *_self; + PyObject *_args; +{ + PyObject *_res = NULL; + OSErr _err; + long index; + AEDesc theAEDesc; + if (!PyArg_ParseTuple(_args, "lO&", + &index, + AEDesc_Convert, &theAEDesc)) + return NULL; + _err = AEPutDesc(&_self->ob_itself, + index, + &theAEDesc); + if (_err != noErr) return PyMac_Error(_err); + Py_INCREF(Py_None); + _res = Py_None; + return _res; +} + static PyObject *AEDesc_AEGetNthPtr(_self, _args) AEDescObject *_self; PyObject *_args; @@ -253,6 +302,24 @@ static PyObject *AEDesc_AESizeOfNthItem(_self, _args) return _res; } +static PyObject *AEDesc_AEDeleteItem(_self, _args) + AEDescObject *_self; + PyObject *_args; +{ + PyObject *_res = NULL; + OSErr _err; + long index; + if (!PyArg_ParseTuple(_args, "l", + &index)) + return NULL; + _err = AEDeleteItem(&_self->ob_itself, + index); + if (_err != noErr) return PyMac_Error(_err); + Py_INCREF(Py_None); + _res = Py_None; + return _res; +} + static PyObject *AEDesc_AEPutParamPtr(_self, _args) AEDescObject *_self; PyObject *_args; @@ -652,12 +719,18 @@ static PyMethodDef AEDesc_methods[] = { "() -> (AEDesc result)"}, {"AECountItems", (PyCFunction)AEDesc_AECountItems, 1, "() -> (long theCount)"}, + {"AEPutPtr", (PyCFunction)AEDesc_AEPutPtr, 1, + "(long index, DescType typeCode, Buffer dataPtr) -> None"}, + {"AEPutDesc", (PyCFunction)AEDesc_AEPutDesc, 1, + "(long index, AEDesc theAEDesc) -> None"}, {"AEGetNthPtr", (PyCFunction)AEDesc_AEGetNthPtr, 1, "(long index, DescType desiredType, Buffer dataPtr) -> (AEKeyword theAEKeyword, DescType typeCode, Buffer dataPtr)"}, {"AEGetNthDesc", (PyCFunction)AEDesc_AEGetNthDesc, 1, "(long index, DescType desiredType) -> (AEKeyword theAEKeyword, AEDesc result)"}, {"AESizeOfNthItem", (PyCFunction)AEDesc_AESizeOfNthItem, 1, "(long index) -> (DescType typeCode, Size dataSize)"}, + {"AEDeleteItem", (PyCFunction)AEDesc_AEDeleteItem, 1, + "(long index) -> None"}, {"AEPutParamPtr", (PyCFunction)AEDesc_AEPutParamPtr, 1, "(AEKeyword theAEKeyword, DescType typeCode, Buffer dataPtr) -> None"}, {"AEPutParamDesc", (PyCFunction)AEDesc_AEPutParamDesc, 1, @@ -821,76 +894,6 @@ static PyObject *AE_AECreateList(_self, _args) return _res; } -static PyObject *AE_AEPutPtr(_self, _args) - PyObject *_self; - PyObject *_args; -{ - PyObject *_res = NULL; - OSErr _err; - AEDescList theAEDescList; - long index; - DescType typeCode; - char *dataPtr__in__; - long dataPtr__len__; - int dataPtr__in_len__; - if (!PyArg_ParseTuple(_args, "lO&s#", - &index, - PyMac_GetOSType, &typeCode, - &dataPtr__in__, &dataPtr__in_len__)) - return NULL; - dataPtr__len__ = dataPtr__in_len__; - _err = AEPutPtr(&theAEDescList, - index, - typeCode, - dataPtr__in__, dataPtr__len__); - if (_err != noErr) return PyMac_Error(_err); - _res = Py_BuildValue("O&", - AEDesc_New, &theAEDescList); - dataPtr__error__: ; - return _res; -} - -static PyObject *AE_AEPutDesc(_self, _args) - PyObject *_self; - PyObject *_args; -{ - PyObject *_res = NULL; - OSErr _err; - AEDescList theAEDescList; - long index; - AEDesc theAEDesc; - if (!PyArg_ParseTuple(_args, "lO&", - &index, - AEDesc_Convert, &theAEDesc)) - return NULL; - _err = AEPutDesc(&theAEDescList, - index, - &theAEDesc); - if (_err != noErr) return PyMac_Error(_err); - _res = Py_BuildValue("O&", - AEDesc_New, &theAEDescList); - return _res; -} - -static PyObject *AE_AEDeleteItem(_self, _args) - PyObject *_self; - PyObject *_args; -{ - PyObject *_res = NULL; - OSErr _err; - AEDescList theAEDescList; - long index; - if (!PyArg_ParseTuple(_args, "l", - &index)) - return NULL; - _err = AEDeleteItem(&theAEDescList, - index); - if (_err != noErr) return PyMac_Error(_err); - _res = Py_BuildValue("O&", - AEDesc_New, &theAEDescList); - return _res; -} - static PyObject *AE_AECreateAppleEvent(_self, _args) PyObject *_self; PyObject *_args; @@ -1064,12 +1067,6 @@ static PyMethodDef AE_methods[] = { "(DescType typeCode, Buffer dataPtr, DescType toType) -> (AEDesc result)"}, {"AECreateList", (PyCFunction)AE_AECreateList, 1, "(Buffer factoringPtr, Boolean isRecord) -> (AEDescList resultList)"}, - {"AEPutPtr", (PyCFunction)AE_AEPutPtr, 1, - "(long index, DescType typeCode, Buffer dataPtr) -> (AEDescList theAEDescList)"}, - {"AEPutDesc", (PyCFunction)AE_AEPutDesc, 1, - "(long index, AEDesc theAEDesc) -> (AEDescList theAEDescList)"}, - {"AEDeleteItem", (PyCFunction)AE_AEDeleteItem, 1, - "(long index) -> (AEDescList theAEDescList)"}, {"AECreateAppleEvent", (PyCFunction)AE_AECreateAppleEvent, 1, "(AEEventClass theAEEventClass, AEEventID theAEEventID, AEAddressDesc target, short returnID, long transactionID) -> (AppleEvent result)"}, {"AEProcessAppleEvent", (PyCFunction)AE_AEProcessAppleEvent, 1, diff --git a/Mac/Modules/ae/aegen.py b/Mac/Modules/ae/aegen.py index 070f8a0..1769003 100644 --- a/Mac/Modules/ae/aegen.py +++ b/Mac/Modules/ae/aegen.py @@ -41,20 +41,20 @@ f = AEMethod(OSErr, 'AECountItems', ) aedescmethods.append(f) -f = AEFunction(OSErr, 'AEPutPtr', - (AEDescList, 'theAEDescList', OutMode), +f = AEMethod(OSErr, 'AEPutPtr', + (AEDescList_ptr, 'theAEDescList', InMode), (long, 'index', InMode), (DescType, 'typeCode', InMode), (InBuffer, 'dataPtr', InMode), ) -functions.append(f) +aedescmethods.append(f) -f = AEFunction(OSErr, 'AEPutDesc', - (AEDescList, 'theAEDescList', OutMode), +f = AEMethod(OSErr, 'AEPutDesc', + (AEDescList_ptr, 'theAEDescList', InMode), (long, 'index', InMode), (AEDesc_ptr, 'theAEDesc', InMode), ) -functions.append(f) +aedescmethods.append(f) f = AEMethod(OSErr, 'AEGetNthPtr', (AEDescList_ptr, 'theAEDescList', InMode), @@ -83,11 +83,11 @@ f = AEMethod(OSErr, 'AESizeOfNthItem', ) aedescmethods.append(f) -f = AEFunction(OSErr, 'AEDeleteItem', - (AEDescList, 'theAEDescList', OutMode), +f = AEMethod(OSErr, 'AEDeleteItem', + (AEDescList_ptr, 'theAEDescList', InMode), (long, 'index', InMode), ) -functions.append(f) +aedescmethods.append(f) f = AEMethod(OSErr, 'AEPutParamPtr', (AppleEvent_ptr, 'theAppleEvent', InMode), -- cgit v0.12