# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1219760605 0
# Node ID c3bd08b7c78d5b4cbc513dea79164e129e32fa8c
# Parent  654843fddea648e21d9b764d06b06e1781eb789a
(Fx_popup_menu, Fx_popup_dialog, w32_menu_show): Ensure mouse is not
grabbed after menu is finished.

diff -r 654843fddea6 -r c3bd08b7c78d src/ChangeLog
--- a/src/ChangeLog	Tue Aug 26 14:04:14 2008 +0000
+++ b/src/ChangeLog	Tue Aug 26 14:23:25 2008 +0000
@@ -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 -r 654843fddea6 -r c3bd08b7c78d src/w32menu.c
--- a/src/w32menu.c	Tue Aug 26 14:04:14 2008 +0000
+++ b/src/w32menu.c	Tue Aug 26 14:23:25 2008 +0000
@@ -812,6 +812,7 @@
   if (NILP (position))
     {
       discard_menu_items ();
+      FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
       UNGCPRO;
       return Qnil;
     }
@@ -825,6 +826,7 @@
   if (current_popup_menu)
     {
       discard_menu_items ();
+      FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
       UNGCPRO;
       return Qnil;
     }
@@ -837,6 +839,7 @@
   UNBLOCK_INPUT;
 
   discard_menu_items ();
+  FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
 
 #endif /* HAVE_MENUS */
 
@@ -959,6 +962,7 @@
     UNBLOCK_INPUT;
 
     discard_menu_items ();
+    FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
 
     if (error_name) error (error_name);
     return selection;
@@ -1931,6 +1935,7 @@
   /* 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);