summaryrefslogtreecommitdiff
path: root/mac
diff options
context:
space:
mode:
authorAndrew Choi <akochoi@shaw.ca>2001-09-04 06:19:12 +0000
committerAndrew Choi <akochoi@shaw.ca>2001-09-04 06:19:12 +0000
commit41cee00ce4e7bf5050a0cf972bfd50ae7d836c23 (patch)
treeb202e8f54b2d0defb11b7c3355e628033f6f2f4a /mac
parentf44a40f2d2293e67bbdb7eba8e894ac9bffc952b (diff)
downloademacs-41cee00ce4e7bf5050a0cf972bfd50ae7d836c23.tar.gz
2001-09-04 Andrew Choi <akochoi@cse.cuhk.edu.hk>
* src/macmenu.c (mac_menu_show): Use refcon of selected menu item.
Diffstat (limited to 'mac')
-rw-r--r--mac/ChangeLog2
-rw-r--r--mac/src/macmenu.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog
index 1ae1c7fdca8..e1efa1b8cd6 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,5 +1,7 @@
2001-09-04 Andrew Choi <akochoi@cse.cuhk.edu.hk>
+ * src/macmenu.c (mac_menu_show): Use refcon of selected menu item.
+
* src/macterm.c (XTread_socket): Read all pending events in the
event queue instead of one.
diff --git a/mac/src/macmenu.c b/mac/src/macmenu.c
index 41536e466aa..bf695214267 100644
--- a/mac/src/macmenu.c
+++ b/mac/src/macmenu.c
@@ -1702,14 +1702,13 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
SetPort (FRAME_MAC_WINDOW (f));
LocalToGlobal (&pos);
- /* No selection has been chosen yet. */
- menu_item_selection = 0;
-
InsertMenu (menu, -1);
/* Display the menu. */
menu_item_selection = LoWord (PopUpMenuSelect (menu, pos.v, pos.h, 0));
+ GetMenuItemRefCon (menu, menu_item_selection, &menu_item_selection);
+
DeleteMenu (POPUP_SUBMENU_ID);
#if 0