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/fm/fmsupport.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/fm/fmsupport.py')
| -rw-r--r-- | Mac/Modules/fm/fmsupport.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Mac/Modules/fm/fmsupport.py b/Mac/Modules/fm/fmsupport.py index 1afc8b8..9ec1e0e 100644 --- a/Mac/Modules/fm/fmsupport.py +++ b/Mac/Modules/fm/fmsupport.py @@ -19,14 +19,18 @@ from macsupport import * # Create the type objects includestuff = includestuff + """ -#include <%s>""" % MACHEADERFILE + """ +#ifdef WITHOUT_FRAMEWORKS +#include <Fonts.h> +#else +#include <Carbon/Carbon.h> +#endif + /* ** Parse/generate ComponentDescriptor records */ static PyObject * -FMRec_New(itself) - FMetricRec *itself; +FMRec_New(FMetricRec *itself) { return Py_BuildValue("O&O&O&O&O&", @@ -40,9 +44,7 @@ FMRec_New(itself) #if 0 /* Not needed... */ static int -FMRec_Convert(v, p_itself) - PyObject *v; - FMetricRec *p_itself; +FMRec_Convert(PyObject *v, FMetricRec *p_itself) { return PyArg_ParseTuple(v, "O&O&O&O&O&", PyMac_GetFixed, &itself->ascent, |