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/menu/menusupport.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/menu/menusupport.py')
| -rw-r--r-- | Mac/Modules/menu/menusupport.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Mac/Modules/menu/menusupport.py b/Mac/Modules/menu/menusupport.py index 4de26a2..a438f14 100644 --- a/Mac/Modules/menu/menusupport.py +++ b/Mac/Modules/menu/menusupport.py @@ -36,8 +36,13 @@ FMFontFamily = Type("FMFontFamily", "h") FMFontStyle = Type("FMFontStyle", "h") includestuff = includestuff + """ +#ifdef WITHOUT_FRAMEWORKS #include <Devices.h> /* Defines OpenDeskAcc in universal headers */ -#include <%s>""" % MACHEADERFILE + """ +#include <Menus.h> +#else +#include <Carbon/Carbon.h> +#endif + #ifdef USE_TOOLBOX_OBJECT_GLUE @@ -63,8 +68,8 @@ extern int _MenuObj_Convert(PyObject *, MenuHandle *); """ initstuff = initstuff + """ - PyMac_INIT_TOOLBOX_OBJECT_NEW(MenuObj_New); - PyMac_INIT_TOOLBOX_OBJECT_CONVERT(MenuObj_Convert); + PyMac_INIT_TOOLBOX_OBJECT_NEW(MenuHandle, MenuObj_New); + PyMac_INIT_TOOLBOX_OBJECT_CONVERT(MenuHandle, MenuObj_Convert); """ class MyObjectDefinition(GlobalObjectDefinition): |