Commit 90816b86 authored by Jason Rumney's avatar Jason Rumney

* w32fns.c (w32_wnd_proc) [WM_INITMENU]: Set menubar_active frame parameter.

parent 904700a0
2007-02-22 Jason Rumney <jasonr@gnu.org>
* w32fns.c (w32_wnd_proc) [WM_INITMENU]: Set menubar_active frame
parameter.
* 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.
(w32_wnd_proc) [WM_EXITMENULOOP, WM_TIMER]: 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.
......
......@@ -3472,6 +3472,9 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
if (find_deferred_msg (hwnd, msg) != NULL)
abort ();
if (f)
f->output_data.w32->menubar_active = 1;
return send_deferred_msg (&msg_buf, hwnd, msg, wParam, lParam);
}
......
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