diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-05-22 21:56:42 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-05-22 21:56:42 (GMT) |
| commit | fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f (patch) | |
| tree | 405f4572ec550f86d0c2c2b3a84ca672f3a70520 /Mac/Modules/list/listsupport.py | |
| parent | 1129671350048d9f415d3ba3c411b9bcd8b7ae75 (diff) | |
| download | cpython-fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f.zip cpython-fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f.tar.gz cpython-fa77e1a1b1ec479600a0f3a1dbc3faf28140d31f.tar.bz2 | |
Lots more Carbon/Carbon.h includes, new UPP routine names, function prototypes. Most toolbox modules now compile, link and import in MacOSX-MachO python.
Diffstat (limited to 'Mac/Modules/list/listsupport.py')
| -rw-r--r-- | Mac/Modules/list/listsupport.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Mac/Modules/list/listsupport.py b/Mac/Modules/list/listsupport.py index 751f16b..d5ddd5b 100644 --- a/Mac/Modules/list/listsupport.py +++ b/Mac/Modules/list/listsupport.py @@ -35,8 +35,11 @@ Handle = OpaqueByValueType("Handle", "ResObj") CGrafPtr = OpaqueByValueType("CGrafPtr", "GrafObj") includestuff = includestuff + """ -#include <%s>""" % MACHEADERFILE + """ - +#ifdef WITHOUT_FRAMEWORKS +#include <Lists.h> +#else +#include <Carbon/Carbon.h> +#endif #ifdef USE_TOOLBOX_OBJECT_GLUE extern PyObject *_ListObj_New(ListHandle); @@ -76,8 +79,8 @@ extern int _ListObj_Convert(PyObject *, ListHandle *); """ initstuff = initstuff + """ - PyMac_INIT_TOOLBOX_OBJECT_NEW(ListObj_New); - PyMac_INIT_TOOLBOX_OBJECT_CONVERT(ListObj_Convert); + PyMac_INIT_TOOLBOX_OBJECT_NEW(ListHandle, ListObj_New); + PyMac_INIT_TOOLBOX_OBJECT_CONVERT(ListHandle, ListObj_Convert); """ class ListMethodGenerator(MethodGenerator): @@ -102,10 +105,7 @@ getattrHookCode = """{ setattrCode = """ static int -ListObj_setattr(self, name, value) - ListObject *self; - char *name; - PyObject *value; +ListObj_setattr(ListObject *self, char *name, PyObject *value) { long intval; |