Fixed bug [1192095] (issue 2) - Toplevel menus return incorrect active indexbug_1192095

1 files changed, 11 insertions, 1 deletions

diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 4593928..4478dd6 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -1287,7 +1287,17 @@ TkWinHandleMenuEvent(
 	    if (menuPtr != NULL) {
 		long entryIndex = LOWORD(*pwParam);
 
-		mePtr = NULL;
+                if ((menuPtr->menuType == MENUBAR) && menuPtr->tearoff) {
+                    /*
+                     * Windows passes the entry index starting at 0 for
+                     * the first menu entry. However this entry #0 is the
+                     * tearoff entry for Tk (the menu has -tearoff 1),
+                     * which is ignored for MENUBAR menues on Windows.
+                     */
+
+                    entryIndex++;
+                }
+                mePtr = NULL;
 		if (flags != 0xFFFF) {
 		    if ((flags&MF_POPUP) && (entryIndex<menuPtr->numEntries)) {
 			mePtr = menuPtr->entries[entryIndex];