[Python-checkins] python/dist/src/Mac/Modules/fm _Fmmodule.c,1.8,1.8.6.1

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/Modules/fm
In directory sc8-pr-cvs1:/tmp/cvs-serv28363/Mac/Modules/fm

Modified Files:
      Tag: getargs_mask_mods
	_Fmmodule.c 
Log Message:
Fixes for the new PyArg_ParseTuple k and K format chars, and the
changed semantics of h. Only lightly tested, but the IDE works
again.

These changes may not be needed anymore now that the semantic change
to h has been reverted, so I'm checking it in on a branch.


Index: _Fmmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/fm/_Fmmodule.c,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -C2 -d -r1.8 -r1.8.6.1
*** _Fmmodule.c	12 Dec 2002 10:31:50 -0000	1.8
--- _Fmmodule.c	18 Apr 2003 08:58:42 -0000	1.8.6.1
***************
*** 15,21 ****
  /* Macro to test whether a weak-loaded CFM function exists */
  #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL )  {\
!     	PyErr_SetString(PyExc_NotImplementedError, \
!     	"Not available in this shared library/OS version"); \
!     	return NULL; \
      }} while(0)
  
--- 15,21 ----
  /* Macro to test whether a weak-loaded CFM function exists */
  #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL )  {\
!         PyErr_SetString(PyExc_NotImplementedError, \
!         "Not available in this shared library/OS version"); \
!         return NULL; \
      }} while(0)
  
***************
*** 68,72 ****
  	PyMac_PRECHECK(GetFontName);
  #endif
! 	if (!PyArg_ParseTuple(_args, "h",
  	                      &familyID))
  		return NULL;
--- 68,72 ----
  	PyMac_PRECHECK(GetFontName);
  #endif
! 	if (!PyArg_ParseTuple(_args, "H",
  	                      &familyID))
  		return NULL;
***************
*** 91,95 ****
  	GetFNum(name,
  	        &familyID);
! 	_res = Py_BuildValue("h",
  	                     familyID);
  	return _res;
--- 91,95 ----
  	GetFNum(name,
  	        &familyID);
! 	_res = Py_BuildValue("H",
  	                     familyID);
  	return _res;
***************
*** 105,109 ****
  	PyMac_PRECHECK(RealFont);
  #endif
! 	if (!PyArg_ParseTuple(_args, "hh",
  	                      &fontNum,
  	                      &size))
--- 105,109 ----
  	PyMac_PRECHECK(RealFont);
  #endif
! 	if (!PyArg_ParseTuple(_args, "HH",
  	                      &fontNum,
  	                      &size))
***************
*** 173,177 ****
  		return NULL;
  	_rv = GetDefFontSize();
! 	_res = Py_BuildValue("h",
  	                     _rv);
  	return _res;
--- 173,177 ----
  		return NULL;
  	_rv = GetDefFontSize();
! 	_res = Py_BuildValue("H",
  	                     _rv);
  	return _res;
***************
*** 270,274 ****
  		return NULL;
  	_rv = GetSysFont();
! 	_res = Py_BuildValue("h",
  	                     _rv);
  	return _res;
--- 270,274 ----
  		return NULL;
  	_rv = GetSysFont();
! 	_res = Py_BuildValue("H",
  	                     _rv);
  	return _res;
***************
*** 285,289 ****
  		return NULL;
  	_rv = GetAppFont();
! 	_res = Py_BuildValue("h",
  	                     _rv);
  	return _res;
--- 285,289 ----
  		return NULL;
  	_rv = GetAppFont();
! 	_res = Py_BuildValue("H",
  	                     _rv);
  	return _res;