[Python-checkins] python/dist/src/Mac/Modules/menu _Menumodule.c, 1.19, 1.20

[jackjansen at users.sourceforge.net]

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

Modified Files:
	_Menumodule.c 
Log Message:
Finished update to UH 3.4.2.


Index: _Menumodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/menu/_Menumodule.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** _Menumodule.c	20 Nov 2003 13:30:58 -0000	1.19
--- _Menumodule.c	6 Dec 2003 00:00:04 -0000	1.20
***************
*** 121,125 ****
  {
  	PyObject *_res = NULL;
! 	short _rv;
  #ifndef CountMenuItems
  	PyMac_PRECHECK(CountMenuItems);
--- 121,125 ----
  {
  	PyObject *_res = NULL;
! 	UInt16 _rv;
  #ifndef CountMenuItems
  	PyMac_PRECHECK(CountMenuItems);
***************
*** 128,132 ****
  		return NULL;
  	_rv = CountMenuItems(_self->ob_itself);
! 	_res = Py_BuildValue("h",
  	                     _rv);
  	return _res;
--- 128,132 ----
  		return NULL;
  	_rv = CountMenuItems(_self->ob_itself);
! 	_res = Py_BuildValue("H",
  	                     _rv);
  	return _res;
***************
*** 1974,1986 ****
  	PyObject *_res = NULL;
  	Boolean _rv;
! 	MenuItemIndex item;
  #ifndef IsMenuItemInvalid
  	PyMac_PRECHECK(IsMenuItemInvalid);
  #endif
  	if (!PyArg_ParseTuple(_args, "h",
! 	                      &item))
  		return NULL;
  	_rv = IsMenuItemInvalid(_self->ob_itself,
! 	                        item);
  	_res = Py_BuildValue("b",
  	                     _rv);
--- 1974,1986 ----
  	PyObject *_res = NULL;
  	Boolean _rv;
! 	MenuItemIndex inItem;
  #ifndef IsMenuItemInvalid
  	PyMac_PRECHECK(IsMenuItemInvalid);
  #endif
  	if (!PyArg_ParseTuple(_args, "h",
! 	                      &inItem))
  		return NULL;
  	_rv = IsMenuItemInvalid(_self->ob_itself,
! 	                        inItem);
  	_res = Py_BuildValue("b",
  	                     _rv);
***************
*** 1992,2007 ****
  	PyObject *_res = NULL;
  	OSStatus _err;
! 	MenuItemIndex firstItem;
! 	ItemCount numItems;
  #ifndef InvalidateMenuItems
  	PyMac_PRECHECK(InvalidateMenuItems);
  #endif
  	if (!PyArg_ParseTuple(_args, "hl",
! 	                      &firstItem,
! 	                      &numItems))
  		return NULL;
  	_err = InvalidateMenuItems(_self->ob_itself,
! 	                           firstItem,
! 	                           numItems);
  	if (_err != noErr) return PyMac_Error(_err);
  	Py_INCREF(Py_None);
--- 1992,2007 ----
  	PyObject *_res = NULL;
  	OSStatus _err;
! 	MenuItemIndex inFirstItem;
! 	ItemCount inNumItems;
  #ifndef InvalidateMenuItems
  	PyMac_PRECHECK(InvalidateMenuItems);
  #endif
  	if (!PyArg_ParseTuple(_args, "hl",
! 	                      &inFirstItem,
! 	                      &inNumItems))
  		return NULL;
  	_err = InvalidateMenuItems(_self->ob_itself,
! 	                           inFirstItem,
! 	                           inNumItems);
  	if (_err != noErr) return PyMac_Error(_err);
  	Py_INCREF(Py_None);
***************
*** 2303,2307 ****
  	 PyDoc_STR("() -> None")},
  	{"CountMenuItems", (PyCFunction)MenuObj_CountMenuItems, 1,
! 	 PyDoc_STR("() -> (short _rv)")},
  	{"GetMenuFont", (PyCFunction)MenuObj_GetMenuFont, 1,
  	 PyDoc_STR("() -> (SInt16 outFontID, UInt16 outFontSize)")},
--- 2303,2307 ----
  	 PyDoc_STR("() -> None")},
  	{"CountMenuItems", (PyCFunction)MenuObj_CountMenuItems, 1,
! 	 PyDoc_STR("() -> (UInt16 _rv)")},
  	{"GetMenuFont", (PyCFunction)MenuObj_GetMenuFont, 1,
  	 PyDoc_STR("() -> (SInt16 outFontID, UInt16 outFontSize)")},
***************
*** 2487,2493 ****
  	 PyDoc_STR("(MenuCommand inCommandID, OSType inPropertyCreator, OSType inPropertyTag) -> None")},
  	{"IsMenuItemInvalid", (PyCFunction)MenuObj_IsMenuItemInvalid, 1,
! 	 PyDoc_STR("(MenuItemIndex item) -> (Boolean _rv)")},
  	{"InvalidateMenuItems", (PyCFunction)MenuObj_InvalidateMenuItems, 1,
! 	 PyDoc_STR("(MenuItemIndex firstItem, ItemCount numItems) -> None")},
  	{"UpdateInvalidMenuItems", (PyCFunction)MenuObj_UpdateInvalidMenuItems, 1,
  	 PyDoc_STR("() -> None")},
--- 2487,2493 ----
  	 PyDoc_STR("(MenuCommand inCommandID, OSType inPropertyCreator, OSType inPropertyTag) -> None")},
  	{"IsMenuItemInvalid", (PyCFunction)MenuObj_IsMenuItemInvalid, 1,
! 	 PyDoc_STR("(MenuItemIndex inItem) -> (Boolean _rv)")},
  	{"InvalidateMenuItems", (PyCFunction)MenuObj_InvalidateMenuItems, 1,
! 	 PyDoc_STR("(MenuItemIndex inFirstItem, ItemCount inNumItems) -> None")},
  	{"UpdateInvalidMenuItems", (PyCFunction)MenuObj_UpdateInvalidMenuItems, 1,
  	 PyDoc_STR("() -> None")},