(Fx_popup_menu, Fx_popup_dialog, w32_menu_show): Ensure mouse is not

grabbed after menu is finished.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2fac842fc4a5d20af40af741b8e3cc61d76aab57..d43e8652b4f6295fb31f48bd8843abda144d38b2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-26  Jason Rumney  <jasonr@gnu.org>
+
+       * w32menu.c (Fx_popup_menu, Fx_popup_dialog, w32_menu_show): Ensure
+       mouse is not grabbed after menu is finished.
+
 2008-08-26  Juanma Barranquero  <lekktu@gmail.com>
 
        * editfns.c (Ffield_string_no_properties): Fix typo in docstring.

diff --git a/src/w32menu.c b/src/w32menu.c
index 1dbb2229e5a6100ba59beb027ed581b20eabc787..be3668017e0d50a1aa72c19754c62a404e9e1945 100644 (file)
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -812,6 +812,7 @@ cached information about equivalent key sequences.  */)
   if (NILP (position))
     {
       discard_menu_items ();
+      FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
       UNGCPRO;
       return Qnil;
     }
@@ -825,6 +826,7 @@ cached information about equivalent key sequences.  */)
   if (current_popup_menu)
     {
       discard_menu_items ();
+      FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
       UNGCPRO;
       return Qnil;
     }
@@ -837,6 +839,7 @@ cached information about equivalent key sequences.  */)
   UNBLOCK_INPUT;
 
   discard_menu_items ();
+  FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
 
 #endif /* HAVE_MENUS */
 
@@ -959,6 +962,7 @@ otherwise it is "Question". */)
     UNBLOCK_INPUT;
 
     discard_menu_items ();
+    FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
 
     if (error_name) error (error_name);
     return selection;
@@ -1931,6 +1935,7 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error)
   /* Clean up extraneous mouse events which might have been generated
      during the call. */
   discard_mouse_events ();
+  FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
 
   /* Free the widget_value objects we used to specify the contents.  */
   free_menubar_widget_value_tree (first_wv);