# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1172185474 0
# Node ID 27d8a3520956f9cea6386417ed4a54a0ba93e680
# Parent  3479e5ecb04052894e7833e4ca41b6f4e96122f2
*** empty log message ***

diff -r 3479e5ecb040 -r 27d8a3520956 src/ChangeLog
--- a/src/ChangeLog	Thu Feb 22 23:03:56 2007 +0000
+++ b/src/ChangeLog	Thu Feb 22 23:04:34 2007 +0000
@@ -1,13 +1,17 @@
 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.