diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2003-12-06 00:00:17 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2003-12-06 00:00:17 (GMT) |
| commit | 67ff6d9930ae7fdb79f7034b65834488f188bd38 (patch) | |
| tree | 474f894ea5de95111d76953618970dd19e0667c4 /Mac/Modules/menu | |
| parent | da78a5d5b6867ba412afd9edd9fc2a3ddd71fe60 (diff) | |
| download | cpython-67ff6d9930ae7fdb79f7034b65834488f188bd38.zip cpython-67ff6d9930ae7fdb79f7034b65834488f188bd38.tar.gz cpython-67ff6d9930ae7fdb79f7034b65834488f188bd38.tar.bz2 | |
Finished update to UH 3.4.2.
Diffstat (limited to 'Mac/Modules/menu')
| -rw-r--r-- | Mac/Modules/menu/_Menumodule.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Mac/Modules/menu/_Menumodule.c b/Mac/Modules/menu/_Menumodule.c index feb9bd2..8596a9d 100644 --- a/Mac/Modules/menu/_Menumodule.c +++ b/Mac/Modules/menu/_Menumodule.c @@ -120,14 +120,14 @@ static PyObject *MenuObj_CalcMenuSize(MenuObject *_self, PyObject *_args) static PyObject *MenuObj_CountMenuItems(MenuObject *_self, PyObject *_args) { PyObject *_res = NULL; - short _rv; + UInt16 _rv; #ifndef CountMenuItems PyMac_PRECHECK(CountMenuItems); #endif if (!PyArg_ParseTuple(_args, "")) return NULL; _rv = CountMenuItems(_self->ob_itself); - _res = Py_BuildValue("h", + _res = Py_BuildValue("H", _rv); return _res; } @@ -1973,15 +1973,15 @@ static PyObject *MenuObj_IsMenuItemInvalid(MenuObject *_self, PyObject *_args) { PyObject *_res = NULL; Boolean _rv; - MenuItemIndex item; + MenuItemIndex inItem; #ifndef IsMenuItemInvalid PyMac_PRECHECK(IsMenuItemInvalid); #endif if (!PyArg_ParseTuple(_args, "h", - &item)) + &inItem)) return NULL; _rv = IsMenuItemInvalid(_self->ob_itself, - item); + inItem); _res = Py_BuildValue("b", _rv); return _res; @@ -1991,18 +1991,18 @@ static PyObject *MenuObj_InvalidateMenuItems(MenuObject *_self, PyObject *_args) { PyObject *_res = NULL; OSStatus _err; - MenuItemIndex firstItem; - ItemCount numItems; + MenuItemIndex inFirstItem; + ItemCount inNumItems; #ifndef InvalidateMenuItems PyMac_PRECHECK(InvalidateMenuItems); #endif if (!PyArg_ParseTuple(_args, "hl", - &firstItem, - &numItems)) + &inFirstItem, + &inNumItems)) return NULL; _err = InvalidateMenuItems(_self->ob_itself, - firstItem, - numItems); + inFirstItem, + inNumItems); if (_err != noErr) return PyMac_Error(_err); Py_INCREF(Py_None); _res = Py_None; @@ -2302,7 +2302,7 @@ static PyMethodDef MenuObj_methods[] = { {"CalcMenuSize", (PyCFunction)MenuObj_CalcMenuSize, 1, PyDoc_STR("() -> None")}, {"CountMenuItems", (PyCFunction)MenuObj_CountMenuItems, 1, - PyDoc_STR("() -> (short _rv)")}, + PyDoc_STR("() -> (UInt16 _rv)")}, {"GetMenuFont", (PyCFunction)MenuObj_GetMenuFont, 1, PyDoc_STR("() -> (SInt16 outFontID, UInt16 outFontSize)")}, {"SetMenuFont", (PyCFunction)MenuObj_SetMenuFont, 1, @@ -2486,9 +2486,9 @@ static PyMethodDef MenuObj_methods[] = { {"RemoveMenuCommandProperty", (PyCFunction)MenuObj_RemoveMenuCommandProperty, 1, PyDoc_STR("(MenuCommand inCommandID, OSType inPropertyCreator, OSType inPropertyTag) -> None")}, {"IsMenuItemInvalid", (PyCFunction)MenuObj_IsMenuItemInvalid, 1, - PyDoc_STR("(MenuItemIndex item) -> (Boolean _rv)")}, + PyDoc_STR("(MenuItemIndex inItem) -> (Boolean _rv)")}, {"InvalidateMenuItems", (PyCFunction)MenuObj_InvalidateMenuItems, 1, - PyDoc_STR("(MenuItemIndex firstItem, ItemCount numItems) -> None")}, + PyDoc_STR("(MenuItemIndex inFirstItem, ItemCount inNumItems) -> None")}, {"UpdateInvalidMenuItems", (PyCFunction)MenuObj_UpdateInvalidMenuItems, 1, PyDoc_STR("() -> None")}, {"CreateStandardFontMenu", (PyCFunction)MenuObj_CreateStandardFontMenu, 1, |