2001-09-04 Andrew Choi <akochoi@cse.cuhk.edu.hk>

	* src/macmenu.c (mac_menu_show): Use refcon of selected menu item.

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 1ae1c7fdca86294200ca83d2cebc46df685b20d1..e1efa1b8cd639ff317e200632a1a9ce222b4b628 100644 (file)
--- 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 41536e466aa6fb8ab33eb98a8d75c186db33daa1..bf695214267013c2a97636db952e9a755a64c1be 100644 (file)
--- 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