[Python-checkins] CVS: python/dist/src/Mac/Modules/fm Fmmodule.c,1.7,1.8

2001年5月22日 14:52:24 -0700

Update of /cvsroot/python/python/dist/src/Mac/Modules/fm
In directory usw-pr-cvs1:/tmp/cvs-serv14119/Python/Mac/Modules/fm
Modified Files:
	Fmmodule.c 
Log Message:
Lots more Carbon/Carbon.h includes, new UPP routine names, function prototypes. Most toolbox modules now compile, link and import in MacOSX-MachO python.
Index: Fmmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/fm/Fmmodule.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Fmmodule.c	2000年12月10日 23:43:41	1.7
--- Fmmodule.c	2001年05月22日 21:52:22	1.8
***************
*** 9,13 ****
--- 9,18 ----
 #include "pymactoolbox.h"
 
+ #ifdef WITHOUT_FRAMEWORKS
 #include <Fonts.h>
+ #else
+ #include <Carbon/Carbon.h>
+ #endif
+ 
 
 /*
***************
*** 15,20 ****
 */
 static PyObject *
! FMRec_New(itself)
! 	FMetricRec *itself;
 {
 
--- 20,24 ----
 */
 static PyObject *
! FMRec_New(FMetricRec *itself)
 {
 
***************
*** 30,36 ****
 /* Not needed... */
 static int
! FMRec_Convert(v, p_itself)
! 	PyObject *v;
! 	FMetricRec *p_itself;
 {
 	return PyArg_ParseTuple(v, "O&O&O&O&O&",
--- 34,38 ----
 /* Not needed... */
 static int
! FMRec_Convert(PyObject *v, FMetricRec *p_itself)
 {
 	return PyArg_ParseTuple(v, "O&O&O&O&O&",
***************
*** 48,54 ****
 #if !TARGET_API_MAC_CARBON
 
! static PyObject *Fm_InitFonts(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 50,54 ----
 #if !TARGET_API_MAC_CARBON
 
! static PyObject *Fm_InitFonts(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 62,68 ****
 #endif
 
! static PyObject *Fm_GetFontName(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 62,66 ----
 #endif
 
! static PyObject *Fm_GetFontName(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 79,85 ****
 }
 
! static PyObject *Fm_GetFNum(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 77,81 ----
 }
 
! static PyObject *Fm_GetFNum(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 96,102 ****
 }
 
! static PyObject *Fm_RealFont(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 92,96 ----
 }
 
! static PyObject *Fm_RealFont(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 117,123 ****
 #if !TARGET_API_MAC_CARBON
 
! static PyObject *Fm_SetFontLock(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 111,115 ----
 #if !TARGET_API_MAC_CARBON
 
! static PyObject *Fm_SetFontLock(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 133,139 ****
 #endif
 
! static PyObject *Fm_SetFScaleDisable(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 125,129 ----
 #endif
 
! static PyObject *Fm_SetFScaleDisable(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 148,154 ****
 }
 
! static PyObject *Fm_FontMetrics(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 138,142 ----
 }
 
! static PyObject *Fm_FontMetrics(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 162,168 ****
 }
 
! static PyObject *Fm_SetFractEnable(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 150,154 ----
 }
 
! static PyObject *Fm_SetFractEnable(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 177,183 ****
 }
 
! static PyObject *Fm_GetDefFontSize(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 163,167 ----
 }
 
! static PyObject *Fm_GetDefFontSize(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 191,197 ****
 }
 
! static PyObject *Fm_IsOutline(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 175,179 ----
 }
 
! static PyObject *Fm_IsOutline(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 210,216 ****
 }
 
! static PyObject *Fm_SetOutlinePreferred(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 192,196 ----
 }
 
! static PyObject *Fm_SetOutlinePreferred(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 225,231 ****
 }
 
! static PyObject *Fm_GetOutlinePreferred(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 205,209 ----
 }
 
! static PyObject *Fm_GetOutlinePreferred(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 239,245 ****
 }
 
! static PyObject *Fm_SetPreserveGlyph(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 217,221 ----
 }
 
! static PyObject *Fm_SetPreserveGlyph(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 254,260 ****
 }
 
! static PyObject *Fm_GetPreserveGlyph(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 230,234 ----
 }
 
! static PyObject *Fm_GetPreserveGlyph(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 270,276 ****
 #if !TARGET_API_MAC_CARBON
 
! static PyObject *Fm_FlushFonts(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 244,248 ----
 #if !TARGET_API_MAC_CARBON
 
! static PyObject *Fm_FlushFonts(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 286,292 ****
 #endif
 
! static PyObject *Fm_GetSysFont(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 258,262 ----
 #endif
 
! static PyObject *Fm_GetSysFont(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 300,306 ****
 }
 
! static PyObject *Fm_GetAppFont(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 270,274 ----
 }
 
! static PyObject *Fm_GetAppFont(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 314,320 ****
 }
 
! static PyObject *Fm_SetAntiAliasedTextEnabled(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 282,286 ----
 }
 
! static PyObject *Fm_SetAntiAliasedTextEnabled(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 334,340 ****
 }
 
! static PyObject *Fm_IsAntiAliasedTextEnabled(_self, _args)
! 	PyObject *_self;
! 	PyObject *_args;
 {
 	PyObject *_res = NULL;
--- 300,304 ----
 }
 
! static PyObject *Fm_IsAntiAliasedTextEnabled(PyObject *_self, PyObject *_args)
 {
 	PyObject *_res = NULL;
***************
*** 404,408 ****
 
 
! void initFm()
 {
 	PyObject *m;
--- 368,372 ----
 
 
! void initFm(void)
 {
 	PyObject *m;