The output MenuRef of GetMenuItemHierarchicalMenu() may be NULL.

diff --git a/Mac/Modules/menu/_Menumodule.c b/Mac/Modules/menu/_Menumodule.c
index 3395b4d3772061948f1e2070f93620d32daecebe..f46eb83098e469ca0941120704d6024d89b98af0 100644 (file)
--- a/Mac/Modules/menu/_Menumodule.c
+++ b/Mac/Modules/menu/_Menumodule.c
@@ -1638,7 +1638,7 @@ static PyObject *MenuObj_GetMenuItemHierarchicalMenu(MenuObject *_self, PyObject
                                           &outHierMenu);
        if (_err != noErr) return PyMac_Error(_err);
        _res = Py_BuildValue("O&",
-                            MenuObj_New, outHierMenu);
+                            OptMenuObj_New, outHierMenu);
        return _res;
 }
 #endif

diff --git a/Mac/Modules/menu/menuscan.py b/Mac/Modules/menu/menuscan.py
index ef2d2f80757cb64b754f0bb11d01f76ba2477fab..11be8f219092b4d56f4dc8326ceaf4e947398ccd 100644 (file)
--- a/Mac/Modules/menu/menuscan.py
+++ b/Mac/Modules/menu/menuscan.py
@@ -144,6 +144,8 @@ class MyScanner(Scanner):
                        ([("void", "*", "OutMode"), ("long", "*", "InMode"),
                                                    ("long", "*", "OutMode")],
                         [("VarVarOutBuffer", "*", "InOutMode")]),
+                       ([("MenuRef", 'outHierMenu', "OutMode")],
+                        [("OptMenuRef", 'outHierMenu', "OutMode")]),
                        ]
 
        def writeinitialdefs(self):