From 8edfc542f098f98754a959d3414238eab152cb88 Mon Sep 17 00:00:00 2001
From: Just van Rossum <just@letterror.com>
Date: Thu, 3 Jan 2002 12:16:18 +0000
Subject: [PATCH] The output MenuRef of GetMenuItemHierarchicalMenu() may be
 NULL.

---
 Mac/Modules/menu/_Menumodule.c | 2 +-
 Mac/Modules/menu/menuscan.py   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Mac/Modules/menu/_Menumodule.c b/Mac/Modules/menu/_Menumodule.c
index 3395b4d3772..f46eb83098e 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 ef2d2f80757..11be8f21909 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):