diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2000-06-21 22:07:06 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2000-06-21 22:07:06 (GMT) |
| commit | 8d929aee499ddc289c1af07a090fb6b885d4ae0a (patch) | |
| tree | 291be3c1a3efc28930163bed90426b97b0915b8d /Mac/Modules/fm | |
| parent | 349a3d3a9a4a25a217e2060bcecc10177fa549da (diff) | |
| download | cpython-8d929aee499ddc289c1af07a090fb6b885d4ae0a.zip cpython-8d929aee499ddc289c1af07a090fb6b885d4ae0a.tar.gz cpython-8d929aee499ddc289c1af07a090fb6b885d4ae0a.tar.bz2 | |
All relevant toolbox modules have now been carbonized.
Diffstat (limited to 'Mac/Modules/fm')
| -rw-r--r-- | Mac/Modules/fm/Fmmodule.c | 18 | ||||
| -rw-r--r-- | Mac/Modules/fm/fmscan.py | 7 |
2 files changed, 25 insertions, 0 deletions
diff --git a/Mac/Modules/fm/Fmmodule.c b/Mac/Modules/fm/Fmmodule.c index 1d84a31..37d47e8 100644 --- a/Mac/Modules/fm/Fmmodule.c +++ b/Mac/Modules/fm/Fmmodule.c @@ -77,6 +77,8 @@ FMRec_Convert(v, p_itself) static PyObject *Fm_Error; +#ifndef TARGET_API_MAC_CARBON + static PyObject *Fm_InitFonts(_self, _args) PyObject *_self; PyObject *_args; @@ -89,6 +91,7 @@ static PyObject *Fm_InitFonts(_self, _args) _res = Py_None; return _res; } +#endif static PyObject *Fm_GetFontName(_self, _args) PyObject *_self; @@ -143,6 +146,8 @@ static PyObject *Fm_RealFont(_self, _args) return _res; } +#ifndef TARGET_API_MAC_CARBON + static PyObject *Fm_SetFontLock(_self, _args) PyObject *_self; PyObject *_args; @@ -157,6 +162,7 @@ static PyObject *Fm_SetFontLock(_self, _args) _res = Py_None; return _res; } +#endif static PyObject *Fm_SetFScaleDisable(_self, _args) PyObject *_self; @@ -293,6 +299,8 @@ static PyObject *Fm_GetPreserveGlyph(_self, _args) return _res; } +#ifndef TARGET_API_MAC_CARBON + static PyObject *Fm_FlushFonts(_self, _args) PyObject *_self; PyObject *_args; @@ -307,6 +315,7 @@ static PyObject *Fm_FlushFonts(_self, _args) _res = Py_None; return _res; } +#endif static PyObject *Fm_GetSysFont(_self, _args) PyObject *_self; @@ -373,16 +382,22 @@ static PyObject *Fm_IsAntiAliasedTextEnabled(_self, _args) } static PyMethodDef Fm_methods[] = { + +#ifndef TARGET_API_MAC_CARBON {"InitFonts", (PyCFunction)Fm_InitFonts, 1, "() -> None"}, +#endif {"GetFontName", (PyCFunction)Fm_GetFontName, 1, "(short familyID) -> (Str255 name)"}, {"GetFNum", (PyCFunction)Fm_GetFNum, 1, "(Str255 name) -> (short familyID)"}, {"RealFont", (PyCFunction)Fm_RealFont, 1, "(short fontNum, short size) -> (Boolean _rv)"}, + +#ifndef TARGET_API_MAC_CARBON {"SetFontLock", (PyCFunction)Fm_SetFontLock, 1, "(Boolean lockFlag) -> None"}, +#endif {"SetFScaleDisable", (PyCFunction)Fm_SetFScaleDisable, 1, "(Boolean fscaleDisable) -> None"}, {"FontMetrics", (PyCFunction)Fm_FontMetrics, 1, @@ -401,8 +416,11 @@ static PyMethodDef Fm_methods[] = { "(Boolean preserveGlyph) -> None"}, {"GetPreserveGlyph", (PyCFunction)Fm_GetPreserveGlyph, 1, "() -> (Boolean _rv)"}, + +#ifndef TARGET_API_MAC_CARBON {"FlushFonts", (PyCFunction)Fm_FlushFonts, 1, "() -> None"}, +#endif {"GetSysFont", (PyCFunction)Fm_GetSysFont, 1, "() -> (short _rv)"}, {"GetAppFont", (PyCFunction)Fm_GetAppFont, 1, diff --git a/Mac/Modules/fm/fmscan.py b/Mac/Modules/fm/fmscan.py index b06e9cb..3539b6d 100644 --- a/Mac/Modules/fm/fmscan.py +++ b/Mac/Modules/fm/fmscan.py @@ -38,6 +38,13 @@ class MyScanner(Scanner): "AntiTextSetApplicationAware", ] + def makegreylist(self): + return [ + ('#ifndef TARGET_API_MAC_CARBON', [ + 'InitFonts', + 'SetFontLock', + 'FlushFonts', + ])] def makeblacklisttypes(self): return [ "FMInput_ptr", # Not needed for now |