[Python-checkins] CVS: python/dist/src/Mac/Modules/ae AEmodule.c,1.25,1.26
Jack Jansen
jackjansen@users.sourceforge.net
Tue, 22 May 2001 14:50:57 -0700
Update of /cvsroot/python/python/dist/src/Mac/Modules/ae
In directory usw-pr-cvs1:/tmp/cvs-serv13651/Python/Mac/Modules/ae
Modified Files:
AEmodule.c
Log Message:
Lots more Carbon/Carbon.h includes, new UPP routine names, function prototypes. Most toolbox modules now compile, link and import in MacOSX-MachO python.
Index: AEmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ae/AEmodule.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** AEmodule.c 2001/05/17 21:54:14 1.25
--- AEmodule.c 2001/05/22 21:50:54 1.26
***************
*** 9,14 ****
--- 9,18 ----
#include "pymactoolbox.h"
+ #ifdef WITHOUT_FRAMEWORKS
#include <AppleEvents.h>
#include <AEObjects.h>
+ #else
+ #include <Carbon/Carbon.h>
+ #endif
#ifdef USE_TOOLBOX_OBJECT_GLUE
***************
*** 50,55 ****
} AEDescObject;
! PyObject *AEDesc_New(itself)
! AEDesc *itself;
{
AEDescObject *it;
--- 54,58 ----
} AEDescObject;
! PyObject *AEDesc_New(AEDesc *itself)
{
AEDescObject *it;
***************
*** 59,65 ****
return (PyObject *)it;
}
! AEDesc_Convert(v, p_itself)
! PyObject *v;
! AEDesc *p_itself;
{
if (!AEDesc_Check(v))
--- 62,66 ----
return (PyObject *)it;
}
! AEDesc_Convert(PyObject *v, AEDesc *p_itself)
{
if (!AEDesc_Check(v))
***************
*** 72,77 ****
}
! static void AEDesc_dealloc(self)
! AEDescObject *self;
{
AEDisposeDesc(&self->ob_itself);
--- 73,77 ----
}
! static void AEDesc_dealloc(AEDescObject *self)
{
AEDisposeDesc(&self->ob_itself);
***************
*** 79,85 ****
}
! static PyObject *AEDesc_AECoerceDesc(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 79,83 ----
}
! static PyObject *AEDesc_AECoerceDesc(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 99,105 ****
}
! static PyObject *AEDesc_AEDuplicateDesc(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 97,101 ----
}
! static PyObject *AEDesc_AEDuplicateDesc(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 116,122 ****
}
! static PyObject *AEDesc_AECountItems(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 112,116 ----
}
! static PyObject *AEDesc_AECountItems(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 133,139 ****
}
! static PyObject *AEDesc_AEPutPtr(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 127,131 ----
}
! static PyObject *AEDesc_AEPutPtr(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 161,167 ****
}
! static PyObject *AEDesc_AEPutDesc(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 153,157 ----
}
! static PyObject *AEDesc_AEPutDesc(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 182,188 ****
}
! static PyObject *AEDesc_AEGetNthPtr(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 172,176 ----
}
! static PyObject *AEDesc_AEGetNthPtr(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 222,228 ****
}
! static PyObject *AEDesc_AEGetNthDesc(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 210,214 ----
}
! static PyObject *AEDesc_AEGetNthDesc(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 248,254 ****
}
! static PyObject *AEDesc_AESizeOfNthItem(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 234,238 ----
}
! static PyObject *AEDesc_AESizeOfNthItem(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 271,277 ****
}
! static PyObject *AEDesc_AEDeleteItem(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 255,259 ----
}
! static PyObject *AEDesc_AEDeleteItem(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 289,295 ****
}
! static PyObject *AEDesc_AEPutParamPtr(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 271,275 ----
}
! static PyObject *AEDesc_AEPutParamPtr(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 317,323 ****
}
! static PyObject *AEDesc_AEPutParamDesc(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 297,301 ----
}
! static PyObject *AEDesc_AEPutParamDesc(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 338,344 ****
}
! static PyObject *AEDesc_AEGetParamPtr(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 316,320 ----
}
! static PyObject *AEDesc_AEGetParamPtr(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 375,381 ****
}
! static PyObject *AEDesc_AEGetParamDesc(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 351,355 ----
}
! static PyObject *AEDesc_AEGetParamDesc(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 398,404 ****
}
! static PyObject *AEDesc_AESizeOfParam(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 372,376 ----
}
! static PyObject *AEDesc_AESizeOfParam(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 421,427 ****
}
! static PyObject *AEDesc_AEDeleteParam(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 393,397 ----
}
! static PyObject *AEDesc_AEDeleteParam(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 439,445 ****
}
! static PyObject *AEDesc_AEGetAttributePtr(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 409,413 ----
}
! static PyObject *AEDesc_AEGetAttributePtr(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 476,482 ****
}
! static PyObject *AEDesc_AEGetAttributeDesc(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 444,448 ----
}
! static PyObject *AEDesc_AEGetAttributeDesc(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 499,505 ****
}
! static PyObject *AEDesc_AESizeOfAttribute(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 465,469 ----
}
! static PyObject *AEDesc_AESizeOfAttribute(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 522,528 ****
}
! static PyObject *AEDesc_AEPutAttributePtr(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 486,490 ----
}
! static PyObject *AEDesc_AEPutAttributePtr(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 550,556 ****
}
! static PyObject *AEDesc_AEPutAttributeDesc(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 512,516 ----
}
! static PyObject *AEDesc_AEPutAttributeDesc(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 573,579 ****
#if TARGET_API_MAC_CARBON
! static PyObject *AEDesc_AEGetDescDataSize(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 533,537 ----
#if TARGET_API_MAC_CARBON
! static PyObject *AEDesc_AEGetDescDataSize(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 588,594 ****
#endif
! static PyObject *AEDesc_AESend(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 546,550 ----
#endif
! static PyObject *AEDesc_AESend(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 616,622 ****
}
! static PyObject *AEDesc_AEResetTimer(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 572,576 ----
}
! static PyObject *AEDesc_AEResetTimer(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 631,637 ****
}
! static PyObject *AEDesc_AESuspendTheCurrentEvent(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 585,589 ----
}
! static PyObject *AEDesc_AESuspendTheCurrentEvent(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 646,652 ****
}
! static PyObject *AEDesc_AEResumeTheCurrentEvent(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 598,602 ----
}
! static PyObject *AEDesc_AEResumeTheCurrentEvent(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 669,675 ****
}
! static PyObject *AEDesc_AEGetTheCurrentEvent(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 619,623 ----
}
! static PyObject *AEDesc_AEGetTheCurrentEvent(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 684,690 ****
}
! static PyObject *AEDesc_AESetTheCurrentEvent(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 632,636 ----
}
! static PyObject *AEDesc_AESetTheCurrentEvent(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 699,705 ****
}
! static PyObject *AEDesc_AEResolve(_self, _args)
! AEDescObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 645,649 ----
}
! static PyObject *AEDesc_AEResolve(AEDescObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 784,790 ****
PyMethodChain AEDesc_chain = { AEDesc_methods, NULL };
! static PyObject *AEDesc_getattr(self, name)
! AEDescObject *self;
! char *name;
{
--- 728,732 ----
PyMethodChain AEDesc_chain = { AEDesc_methods, NULL };
! static PyObject *AEDesc_getattr(AEDescObject *self, char *name)
{
***************
*** 853,859 ****
! static PyObject *AE_AECoercePtr(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 795,799 ----
! static PyObject *AE_AECoercePtr(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 882,888 ****
}
! static PyObject *AE_AECreateDesc(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 822,826 ----
}
! static PyObject *AE_AECreateDesc(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 908,914 ****
}
! static PyObject *AE_AECreateList(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 846,850 ----
}
! static PyObject *AE_AECreateList(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 934,940 ****
}
! static PyObject *AE_AECreateAppleEvent(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 870,874 ----
}
! static PyObject *AE_AECreateAppleEvent(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 967,973 ****
#if TARGET_API_MAC_CARBON
! static PyObject *AE_AEReplaceDescData(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 901,905 ----
#if TARGET_API_MAC_CARBON
! static PyObject *AE_AEReplaceDescData(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 994,1000 ****
#endif
! static PyObject *AE_AEProcessAppleEvent(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 926,930 ----
#endif
! static PyObject *AE_AEProcessAppleEvent(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1011,1017 ****
}
! static PyObject *AE_AEGetInteractionAllowed(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 941,945 ----
}
! static PyObject *AE_AEGetInteractionAllowed(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1027,1033 ****
}
! static PyObject *AE_AESetInteractionAllowed(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 955,959 ----
}
! static PyObject *AE_AESetInteractionAllowed(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1044,1050 ****
}
! static PyObject *AE_AEInteractWithUser(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 970,974 ----
}
! static PyObject *AE_AEInteractWithUser(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1063,1069 ****
}
! static PyObject *AE_AEInstallEventHandler(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 987,991 ----
}
! static PyObject *AE_AEInstallEventHandler(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1089,1095 ****
}
! static PyObject *AE_AERemoveEventHandler(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1011,1015 ----
}
! static PyObject *AE_AERemoveEventHandler(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1111,1117 ****
}
! static PyObject *AE_AEGetEventHandler(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1031,1035 ----
}
! static PyObject *AE_AEGetEventHandler(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1136,1142 ****
}
! static PyObject *AE_AEInstallSpecialHandler(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1054,1058 ----
}
! static PyObject *AE_AEInstallSpecialHandler(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1155,1161 ****
}
! static PyObject *AE_AERemoveSpecialHandler(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1071,1075 ----
}
! static PyObject *AE_AERemoveSpecialHandler(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1174,1180 ****
}
! static PyObject *AE_AEManagerInfo(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1088,1092 ----
}
! static PyObject *AE_AEManagerInfo(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1193,1199 ****
}
! static PyObject *AE_AEObjectInit(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1105,1109 ----
}
! static PyObject *AE_AEObjectInit(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1208,1214 ****
}
! static PyObject *AE_AEDisposeToken(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1118,1122 ----
}
! static PyObject *AE_AEDisposeToken(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1224,1230 ****
}
! static PyObject *AE_AECallObjectAccessor(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1132,1136 ----
}
! static PyObject *AE_AECallObjectAccessor(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1331,1335 ****
! void initAE()
{
PyObject *m;
--- 1237,1241 ----
! void initAE(void)
{
PyObject *m;
***************
*** 1338,1345 ****
! upp_AEIdleProc = NewAEIdleProc(AEIdleProc);
! upp_GenericEventHandler = NewAEEventHandlerProc(GenericEventHandler);
! PyMac_INIT_TOOLBOX_OBJECT_NEW(AEDesc_New);
! PyMac_INIT_TOOLBOX_OBJECT_CONVERT(AEDesc_Convert);
--- 1244,1251 ----
! upp_AEIdleProc = NewAEIdleUPP(AEIdleProc);
! upp_GenericEventHandler = NewAEEventHandlerUPP(GenericEventHandler);
! PyMac_INIT_TOOLBOX_OBJECT_NEW(AEDesc *, AEDesc_New);
! PyMac_INIT_TOOLBOX_OBJECT_CONVERT(AEDesc, AEDesc_Convert);