From: Just van Rossum <just@letterror.com>
Date: Thu, 3 Jan 2002 12:16:18 +0000 (+0000)
Subject: The output MenuRef of GetMenuItemHierarchicalMenu() may be NULL.
X-Git-Tag: v2.3c1~6897
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8edfc542f098f98754a959d3414238eab152cb88;p=python

The output MenuRef of GetMenuItemHierarchicalMenu() may be NULL.
---

diff --git a/Mac/Modules/menu/_Menumodule.c b/Mac/Modules/menu/_Menumodule.c
index 3395b4d377..f46eb83098 100644
--- 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 ef2d2f8075..11be8f2190 100644
--- 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):