(menubar_active): Remove menu_command_in_progress.

2 files changed, 13 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3f5c6c5a952..63ad9ec6e2e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2007-02-22  Jason Rumney  <jasonr@gnu.org>
+
+	* w32menu.c (current_popup_menu): Make available globally.
+	(menubar_selection_callback): Free menu strings before pushing the
+	menu event into the keyboard buffer.  Remove
+	menu_command_in_progress.
+
+	* w32fns.c (current_popup_menu): Use from w32menu.c.
+	(w32_wnd_proc): Use menubar_active and current_popup_menu to
+	determine whether a menubar menu has been cancelled.
+
+	* w32term.h (w32_output): Remove menu_command_in_progress.
+
 2007-02-22  Kim F. Storm  <storm@cua.dk>
 
 	* dispnew.c (update_frame, update_single_window): Set force_p here if
diff --git a/src/w32term.h b/src/w32term.h
index 9d034f56f5b..cac3e2f8997 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -378,9 +378,6 @@ struct w32_output
   /* Nonzero means menubar is currently active.  */
   char menubar_active;
 
-  /* Nonzero means a menu command is being processed.  */
-  char menu_command_in_progress;
-
   /* Nonzero means menubar is about to become active, but should be
      brought up to date first.  */
   volatile char pending_menu_activation;