@@ -120,14 +120,14 @@ static PyObject *MenuObj_CalcMenuSize(MenuObject *_self, PyObject *_args)
120120static PyObject * MenuObj_CountMenuItems (MenuObject * _self , PyObject * _args )
121121{
122122 PyObject * _res = NULL ;
123- short _rv ;
123+ UInt16 _rv ;
124124#ifndef CountMenuItems
125125 PyMac_PRECHECK (CountMenuItems );
126126#endif
127127 if (!PyArg_ParseTuple (_args , "" ))
128128 return NULL ;
129129 _rv = CountMenuItems (_self -> ob_itself );
130- _res = Py_BuildValue ("h " ,
130+ _res = Py_BuildValue ("H " ,
131131 _rv );
132132 return _res ;
133133}
@@ -1973,15 +1973,15 @@ static PyObject *MenuObj_IsMenuItemInvalid(MenuObject *_self, PyObject *_args)
19731973{
19741974 PyObject * _res = NULL ;
19751975 Boolean _rv ;
1976- MenuItemIndex item ;
1976+ MenuItemIndex inItem ;
19771977#ifndef IsMenuItemInvalid
19781978 PyMac_PRECHECK (IsMenuItemInvalid );
19791979#endif
19801980 if (!PyArg_ParseTuple (_args , "h" ,
1981- & item ))
1981+ & inItem ))
19821982 return NULL ;
19831983 _rv = IsMenuItemInvalid (_self -> ob_itself ,
1984- item );
1984+ inItem );
19851985 _res = Py_BuildValue ("b" ,
19861986 _rv );
19871987 return _res ;
@@ -1991,18 +1991,18 @@ static PyObject *MenuObj_InvalidateMenuItems(MenuObject *_self, PyObject *_args)
19911991{
19921992 PyObject * _res = NULL ;
19931993 OSStatus _err ;
1994- MenuItemIndex firstItem ;
1995- ItemCount numItems ;
1994+ MenuItemIndex inFirstItem ;
1995+ ItemCount inNumItems ;
19961996#ifndef InvalidateMenuItems
19971997 PyMac_PRECHECK (InvalidateMenuItems );
19981998#endif
19991999 if (!PyArg_ParseTuple (_args , "hl" ,
2000- & firstItem ,
2001- & numItems ))
2000+ & inFirstItem ,
2001+ & inNumItems ))
20022002 return NULL ;
20032003 _err = InvalidateMenuItems (_self -> ob_itself ,
2004- firstItem ,
2005- numItems );
2004+ inFirstItem ,
2005+ inNumItems );
20062006 if (_err != noErr ) return PyMac_Error (_err );
20072007 Py_INCREF (Py_None );
20082008 _res = Py_None ;
@@ -2302,7 +2302,7 @@ static PyMethodDef MenuObj_methods[] = {
23022302 {"CalcMenuSize" , (PyCFunction )MenuObj_CalcMenuSize , 1 ,
23032303 PyDoc_STR ("() -> None" )},
23042304 {"CountMenuItems" , (PyCFunction )MenuObj_CountMenuItems , 1 ,
2305- PyDoc_STR ("() -> (short _rv)" )},
2305+ PyDoc_STR ("() -> (UInt16 _rv)" )},
23062306 {"GetMenuFont" , (PyCFunction )MenuObj_GetMenuFont , 1 ,
23072307 PyDoc_STR ("() -> (SInt16 outFontID, UInt16 outFontSize)" )},
23082308 {"SetMenuFont" , (PyCFunction )MenuObj_SetMenuFont , 1 ,
@@ -2486,9 +2486,9 @@ static PyMethodDef MenuObj_methods[] = {
24862486 {"RemoveMenuCommandProperty" , (PyCFunction )MenuObj_RemoveMenuCommandProperty , 1 ,
24872487 PyDoc_STR ("(MenuCommand inCommandID, OSType inPropertyCreator, OSType inPropertyTag) -> None" )},
24882488 {"IsMenuItemInvalid" , (PyCFunction )MenuObj_IsMenuItemInvalid , 1 ,
2489- PyDoc_STR ("(MenuItemIndex item ) -> (Boolean _rv)" )},
2489+ PyDoc_STR ("(MenuItemIndex inItem ) -> (Boolean _rv)" )},
24902490 {"InvalidateMenuItems" , (PyCFunction )MenuObj_InvalidateMenuItems , 1 ,
2491- PyDoc_STR ("(MenuItemIndex firstItem , ItemCount numItems ) -> None" )},
2491+ PyDoc_STR ("(MenuItemIndex inFirstItem , ItemCount inNumItems ) -> None" )},
24922492 {"UpdateInvalidMenuItems" , (PyCFunction )MenuObj_UpdateInvalidMenuItems , 1 ,
24932493 PyDoc_STR ("() -> None" )},
24942494 {"CreateStandardFontMenu" , (PyCFunction )MenuObj_CreateStandardFontMenu , 1 ,
0 commit comments