diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2003-11-20 13:31:00 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2003-11-20 13:31:00 (GMT) |
| commit | 7107c1aff301a65faed24642cdc08f82a1c41cd4 (patch) | |
| tree | 1ce55f300f09be769722831564e22a9f49bbefa5 /Mac/Modules/ibcarbon | |
| parent | 3305d2487d76a8a24448d825e98f8afb4caa76ab (diff) | |
| download | cpython-7107c1aff301a65faed24642cdc08f82a1c41cd4.zip cpython-7107c1aff301a65faed24642cdc08f82a1c41cd4.tar.gz cpython-7107c1aff301a65faed24642cdc08f82a1c41cd4.tar.bz2 | |
Got rid of macglue.h, replacing it by pymactoolbox.h where relevant.
Cleaned up various things in the toolbox modules.
Diffstat (limited to 'Mac/Modules/ibcarbon')
| -rw-r--r-- | Mac/Modules/ibcarbon/IBCarbonsupport.py | 5 | ||||
| -rw-r--r-- | Mac/Modules/ibcarbon/_IBCarbon.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Mac/Modules/ibcarbon/IBCarbonsupport.py b/Mac/Modules/ibcarbon/IBCarbonsupport.py index 04d4bc1..5d07be1 100644 --- a/Mac/Modules/ibcarbon/IBCarbonsupport.py +++ b/Mac/Modules/ibcarbon/IBCarbonsupport.py @@ -10,15 +10,12 @@ IBCarbonMethod = OSErrMethodGenerator includestuff = """ #include <Carbon/Carbon.h> -#include "macglue.h" +#include "pymactoolbox.h" #ifdef USE_TOOLBOX_OBJECT_GLUE extern int _CFStringRefObj_Convert(PyObject *, CFStringRef *); -//#define CFStringRefObj_Convert _CFStringRefObj_Convert #endif -//extern int CFBundleRefObj_Convert(PyObject *, CFBundleRef *); // need to wrap CFBundle - """ initstuff = """ diff --git a/Mac/Modules/ibcarbon/_IBCarbon.c b/Mac/Modules/ibcarbon/_IBCarbon.c index 1d50db2..ce120c3 100644 --- a/Mac/Modules/ibcarbon/_IBCarbon.c +++ b/Mac/Modules/ibcarbon/_IBCarbon.c @@ -6,15 +6,12 @@ #include <Carbon/Carbon.h> -#include "macglue.h" +#include "pymactoolbox.h" #ifdef USE_TOOLBOX_OBJECT_GLUE extern int _CFStringRefObj_Convert(PyObject *, CFStringRef *); -//#define CFStringRefObj_Convert _CFStringRefObj_Convert #endif -//extern int CFBundleRefObj_Convert(PyObject *, CFBundleRef *); // need to wrap CFBundle - static PyObject *IBCarbon_Error; |