Commit 904700a0 authored by Jason Rumney's avatar Jason Rumney
Browse files

(menubar_active): Remove menu_command_in_progress.

parent 5d22ded9
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> 2007-02-22 Kim F. Storm <storm@cua.dk>
   
* dispnew.c (update_frame, update_single_window): Set force_p here if * dispnew.c (update_frame, update_single_window): Set force_p here if
......
...@@ -378,9 +378,6 @@ struct w32_output ...@@ -378,9 +378,6 @@ struct w32_output
/* Nonzero means menubar is currently active. */ /* Nonzero means menubar is currently active. */
char menubar_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 /* Nonzero means menubar is about to become active, but should be
brought up to date first. */ brought up to date first. */
volatile char pending_menu_activation; volatile char pending_menu_activation;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment