Commit 11715f92 authored by Steven Tamm's avatar Steven Tamm

macmenu.c (mac_menu_show): Remove shadowing of menu variable

by using different names for inner loop variables.
parent 4f4ce597
2004-08-30 Steven Tamm <steventamm@mac.com>
* macmenu.c (mac_menu_show): Remove shadowing of menu variable
by using different names for inner loop variables.
2004-08-27 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* xmenu.c (set_frame_menubar): Reintroduce inhibit_garbage_collection
......
......@@ -1807,9 +1807,9 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
/* Get the refcon to find the correct item*/
if (menu_item_selection)
{
menu = GetMenuHandle (HiWord (menu_item_choice));
if (menu) {
GetMenuItemRefCon (menu, menu_item_selection, &refcon);
MenuHandle sel_menu = GetMenuHandle (HiWord (menu_item_choice));
if (sel_menu) {
GetMenuItemRefCon (sel_menu, menu_item_selection, &refcon);
}
}
......@@ -1831,11 +1831,11 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
{
int i = MIN_POPUP_SUBMENU_ID;
MenuHandle submenu = GetMenuHandle (i);
while (menu != NULL)
while (submenu != NULL)
{
DeleteMenu (i);
DisposeMenu (menu);
menu = GetMenuHandle (++i);
DisposeMenu (submenu);
submenu = GetMenuHandle (++i);
}
}
......
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