Commit 89203be0 authored by Jack Jansen's avatar Jack Jansen

Finished update to UH 3.4.2.

parent 47521e6f
...@@ -1750,6 +1750,35 @@ static PyObject *CarbonEvents_GetLastUserEventTime(PyObject *_self, PyObject *_a ...@@ -1750,6 +1750,35 @@ static PyObject *CarbonEvents_GetLastUserEventTime(PyObject *_self, PyObject *_a
return _res; return _res;
} }
static PyObject *CarbonEvents_IsMouseCoalescingEnabled(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
Boolean _rv;
if (!PyArg_ParseTuple(_args, ""))
return NULL;
_rv = IsMouseCoalescingEnabled();
_res = Py_BuildValue("b",
_rv);
return _res;
}
static PyObject *CarbonEvents_SetMouseCoalescingEnabled(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSStatus _err;
Boolean inNewState;
Boolean outOldState;
if (!PyArg_ParseTuple(_args, "b",
&inNewState))
return NULL;
_err = SetMouseCoalescingEnabled(inNewState,
&outOldState);
if (_err != noErr) return PyMac_Error(_err);
_res = Py_BuildValue("b",
outOldState);
return _res;
}
static PyObject *CarbonEvents_GetWindowEventTarget(PyObject *_self, PyObject *_args) static PyObject *CarbonEvents_GetWindowEventTarget(PyObject *_self, PyObject *_args)
{ {
PyObject *_res = NULL; PyObject *_res = NULL;
...@@ -2059,6 +2088,10 @@ static PyMethodDef CarbonEvents_methods[] = { ...@@ -2059,6 +2088,10 @@ static PyMethodDef CarbonEvents_methods[] = {
PyDoc_STR("(GrafPtr inPort, RgnHandle inRegion, Boolean ioWasInRgn) -> (Boolean ioWasInRgn, UInt16 outResult)")}, PyDoc_STR("(GrafPtr inPort, RgnHandle inRegion, Boolean ioWasInRgn) -> (Boolean ioWasInRgn, UInt16 outResult)")},
{"GetLastUserEventTime", (PyCFunction)CarbonEvents_GetLastUserEventTime, 1, {"GetLastUserEventTime", (PyCFunction)CarbonEvents_GetLastUserEventTime, 1,
PyDoc_STR("() -> (double _rv)")}, PyDoc_STR("() -> (double _rv)")},
{"IsMouseCoalescingEnabled", (PyCFunction)CarbonEvents_IsMouseCoalescingEnabled, 1,
PyDoc_STR("() -> (Boolean _rv)")},
{"SetMouseCoalescingEnabled", (PyCFunction)CarbonEvents_SetMouseCoalescingEnabled, 1,
PyDoc_STR("(Boolean inNewState) -> (Boolean outOldState)")},
{"GetWindowEventTarget", (PyCFunction)CarbonEvents_GetWindowEventTarget, 1, {"GetWindowEventTarget", (PyCFunction)CarbonEvents_GetWindowEventTarget, 1,
PyDoc_STR("(WindowPtr inWindow) -> (EventTargetRef _rv)")}, PyDoc_STR("(WindowPtr inWindow) -> (EventTargetRef _rv)")},
{"GetControlEventTarget", (PyCFunction)CarbonEvents_GetControlEventTarget, 1, {"GetControlEventTarget", (PyCFunction)CarbonEvents_GetControlEventTarget, 1,
......
...@@ -131,6 +131,19 @@ static PyObject *Help_HMSetDialogHelpFromBalloonRsrc(PyObject *_self, PyObject * ...@@ -131,6 +131,19 @@ static PyObject *Help_HMSetDialogHelpFromBalloonRsrc(PyObject *_self, PyObject *
return _res; return _res;
} }
static PyObject *Help_HMHideTag(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
OSStatus _err;
if (!PyArg_ParseTuple(_args, ""))
return NULL;
_err = HMHideTag();
if (_err != noErr) return PyMac_Error(_err);
Py_INCREF(Py_None);
_res = Py_None;
return _res;
}
static PyMethodDef Help_methods[] = { static PyMethodDef Help_methods[] = {
{"HMGetHelpMenu", (PyCFunction)Help_HMGetHelpMenu, 1, {"HMGetHelpMenu", (PyCFunction)Help_HMGetHelpMenu, 1,
PyDoc_STR("() -> (MenuRef outHelpMenu, MenuItemIndex outFirstCustomItemIndex)")}, PyDoc_STR("() -> (MenuRef outHelpMenu, MenuItemIndex outFirstCustomItemIndex)")},
...@@ -146,6 +159,8 @@ static PyMethodDef Help_methods[] = { ...@@ -146,6 +159,8 @@ static PyMethodDef Help_methods[] = {
PyDoc_STR("(MenuRef inMenu, SInt16 inHmnuRsrcID) -> None")}, PyDoc_STR("(MenuRef inMenu, SInt16 inHmnuRsrcID) -> None")},
{"HMSetDialogHelpFromBalloonRsrc", (PyCFunction)Help_HMSetDialogHelpFromBalloonRsrc, 1, {"HMSetDialogHelpFromBalloonRsrc", (PyCFunction)Help_HMSetDialogHelpFromBalloonRsrc, 1,
PyDoc_STR("(DialogPtr inDialog, SInt16 inHdlgRsrcID, SInt16 inItemStart) -> None")}, PyDoc_STR("(DialogPtr inDialog, SInt16 inHdlgRsrcID, SInt16 inItemStart) -> None")},
{"HMHideTag", (PyCFunction)Help_HMHideTag, 1,
PyDoc_STR("() -> None")},
{NULL, NULL, 0} {NULL, NULL, 0}
}; };
......
...@@ -120,14 +120,14 @@ static PyObject *MenuObj_CalcMenuSize(MenuObject *_self, PyObject *_args) ...@@ -120,14 +120,14 @@ static PyObject *MenuObj_CalcMenuSize(MenuObject *_self, PyObject *_args)
static PyObject *MenuObj_CountMenuItems(MenuObject *_self, PyObject *_args) static PyObject *MenuObj_CountMenuItems(MenuObject *_self, PyObject *_args)
{ {
PyObject *_res = NULL; PyObject *_res = NULL;
short _rv; UInt16 _rv;
#ifndef CountMenuItems #ifndef CountMenuItems
PyMac_PRECHECK(CountMenuItems); PyMac_PRECHECK(CountMenuItems);
#endif #endif
if (!PyArg_ParseTuple(_args, "")) if (!PyArg_ParseTuple(_args, ""))
return NULL; return NULL;
_rv = CountMenuItems(_self->ob_itself); _rv = CountMenuItems(_self->ob_itself);
_res = Py_BuildValue("h", _res = Py_BuildValue("H",
_rv); _rv);
return _res; return _res;
} }
...@@ -1973,15 +1973,15 @@ static PyObject *MenuObj_IsMenuItemInvalid(MenuObject *_self, PyObject *_args) ...@@ -1973,15 +1973,15 @@ static PyObject *MenuObj_IsMenuItemInvalid(MenuObject *_self, PyObject *_args)
{ {
PyObject *_res = NULL; PyObject *_res = NULL;
Boolean _rv; Boolean _rv;
MenuItemIndex item; MenuItemIndex inItem;
#ifndef IsMenuItemInvalid #ifndef IsMenuItemInvalid
PyMac_PRECHECK(IsMenuItemInvalid); PyMac_PRECHECK(IsMenuItemInvalid);
#endif #endif
if (!PyArg_ParseTuple(_args, "h", if (!PyArg_ParseTuple(_args, "h",
&item)) &inItem))
return NULL; return NULL;
_rv = IsMenuItemInvalid(_self->ob_itself, _rv = IsMenuItemInvalid(_self->ob_itself,
item); inItem);
_res = Py_BuildValue("b", _res = Py_BuildValue("b",
_rv); _rv);
return _res; return _res;
...@@ -1991,18 +1991,18 @@ static PyObject *MenuObj_InvalidateMenuItems(MenuObject *_self, PyObject *_args) ...@@ -1991,18 +1991,18 @@ static PyObject *MenuObj_InvalidateMenuItems(MenuObject *_self, PyObject *_args)
{ {
PyObject *_res = NULL; PyObject *_res = NULL;
OSStatus _err; OSStatus _err;
MenuItemIndex firstItem; MenuItemIndex inFirstItem;
ItemCount numItems; ItemCount inNumItems;
#ifndef InvalidateMenuItems #ifndef InvalidateMenuItems
PyMac_PRECHECK(InvalidateMenuItems); PyMac_PRECHECK(InvalidateMenuItems);
#endif #endif
if (!PyArg_ParseTuple(_args, "hl", if (!PyArg_ParseTuple(_args, "hl",
&firstItem, &inFirstItem,
&numItems)) &inNumItems))
return NULL; return NULL;
_err = InvalidateMenuItems(_self->ob_itself, _err = InvalidateMenuItems(_self->ob_itself,
firstItem, inFirstItem,
numItems); inNumItems);
if (_err != noErr) return PyMac_Error(_err); if (_err != noErr) return PyMac_Error(_err);
Py_INCREF(Py_None); Py_INCREF(Py_None);
_res = Py_None; _res = Py_None;
...@@ -2302,7 +2302,7 @@ static PyMethodDef MenuObj_methods[] = { ...@@ -2302,7 +2302,7 @@ static PyMethodDef MenuObj_methods[] = {
{"CalcMenuSize", (PyCFunction)MenuObj_CalcMenuSize, 1, {"CalcMenuSize", (PyCFunction)MenuObj_CalcMenuSize, 1,
PyDoc_STR("() -> None")}, PyDoc_STR("() -> None")},
{"CountMenuItems", (PyCFunction)MenuObj_CountMenuItems, 1, {"CountMenuItems", (PyCFunction)MenuObj_CountMenuItems, 1,
PyDoc_STR("() -> (short _rv)")}, PyDoc_STR("() -> (UInt16 _rv)")},
{"GetMenuFont", (PyCFunction)MenuObj_GetMenuFont, 1, {"GetMenuFont", (PyCFunction)MenuObj_GetMenuFont, 1,
PyDoc_STR("() -> (SInt16 outFontID, UInt16 outFontSize)")}, PyDoc_STR("() -> (SInt16 outFontID, UInt16 outFontSize)")},
{"SetMenuFont", (PyCFunction)MenuObj_SetMenuFont, 1, {"SetMenuFont", (PyCFunction)MenuObj_SetMenuFont, 1,
...@@ -2486,9 +2486,9 @@ static PyMethodDef MenuObj_methods[] = { ...@@ -2486,9 +2486,9 @@ static PyMethodDef MenuObj_methods[] = {
{"RemoveMenuCommandProperty", (PyCFunction)MenuObj_RemoveMenuCommandProperty, 1, {"RemoveMenuCommandProperty", (PyCFunction)MenuObj_RemoveMenuCommandProperty, 1,
PyDoc_STR("(MenuCommand inCommandID, OSType inPropertyCreator, OSType inPropertyTag) -> None")}, PyDoc_STR("(MenuCommand inCommandID, OSType inPropertyCreator, OSType inPropertyTag) -> None")},
{"IsMenuItemInvalid", (PyCFunction)MenuObj_IsMenuItemInvalid, 1, {"IsMenuItemInvalid", (PyCFunction)MenuObj_IsMenuItemInvalid, 1,
PyDoc_STR("(MenuItemIndex item) -> (Boolean _rv)")}, PyDoc_STR("(MenuItemIndex inItem) -> (Boolean _rv)")},
{"InvalidateMenuItems", (PyCFunction)MenuObj_InvalidateMenuItems, 1, {"InvalidateMenuItems", (PyCFunction)MenuObj_InvalidateMenuItems, 1,
PyDoc_STR("(MenuItemIndex firstItem, ItemCount numItems) -> None")}, PyDoc_STR("(MenuItemIndex inFirstItem, ItemCount inNumItems) -> None")},
{"UpdateInvalidMenuItems", (PyCFunction)MenuObj_UpdateInvalidMenuItems, 1, {"UpdateInvalidMenuItems", (PyCFunction)MenuObj_UpdateInvalidMenuItems, 1,
PyDoc_STR("() -> None")}, PyDoc_STR("() -> None")},
{"CreateStandardFontMenu", (PyCFunction)MenuObj_CreateStandardFontMenu, 1, {"CreateStandardFontMenu", (PyCFunction)MenuObj_CreateStandardFontMenu, 1,
......
This diff is collapsed.
...@@ -120,6 +120,7 @@ extend = 0x40 ...@@ -120,6 +120,7 @@ extend = 0x40
def makeblacklisttypes(self): def makeblacklisttypes(self):
return [ return [
"QDRegionBitsRef", # Should do this, but too lazy now.
'CIconHandle', # Obsolete 'CIconHandle', # Obsolete
'CQDProcs', 'CQDProcs',
'CQDProcsPtr', 'CQDProcsPtr',
...@@ -216,6 +217,18 @@ extend = 0x40 ...@@ -216,6 +217,18 @@ extend = 0x40
([('Pattern_ptr', '*', 'ReturnMode')], ([('Pattern_ptr', '*', 'ReturnMode')],
[('void', '*', 'ReturnMode')]), [('void', '*', 'ReturnMode')]),
([('Point_ptr', 'QDLocalToGlobalPoint', 'ReturnMode')],
[('void', '*', 'ReturnMode')]),
([('Rect_ptr', 'QDLocalToGlobalRect', 'ReturnMode')],
[('void', '*', 'ReturnMode')]),
([('Point_ptr', 'QDGlobalToLocalPoint', 'ReturnMode')],
[('void', '*', 'ReturnMode')]),
([('Rect_ptr', 'QDGlobalToLocalRect', 'ReturnMode')],
[('void', '*', 'ReturnMode')]),
] ]
if __name__ == "__main__": if __name__ == "__main__":
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment