commit 8edfc542f098f98754a959d3414238eab152cb88
author Just van Rossum <just@letterror.com> Thu Jan 03 12:16:18 2002 +0000
committer Just van Rossum <just@letterror.com> Thu Jan 03 12:16:18 2002 +0000
tree 73d8c327e508c5dfe34594e3458741abfbe62e49
parent ad4f532f6532cc099ba5665e3553394db907796c

The output MenuRef of GetMenuItemHierarchicalMenu() may be NULL.

Mac/Modules/menu/_Menumodule.c

diff --git a/Mac/Modules/menu/_Menumodule.c b/Mac/Modules/menu/_Menumodule.c
index 3395b4d..f46eb83 100644
--- a/Mac/Modules/menu/_Menumodule.c
+++ b/Mac/Modules/menu/_Menumodule.c
@@ -1638,7 +1638,7 @@
 	                                   &outHierMenu);
 	if (_err != noErr) return PyMac_Error(_err);
 	_res = Py_BuildValue("O&",
-	                     MenuObj_New, outHierMenu);
+	                     OptMenuObj_New, outHierMenu);
 	return _res;
 }
 #endif

Mac/Modules/menu/menuscan.py

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