2 files changed, 9 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 63ad9ec6e2e..910a73a321d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
 
diff --git a/src/w32fns.c b/src/w32fns.c
index 2fc83ce50a3..3037633c271 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -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);
       }