summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2016-03-27 09:58:56 (GMT)
committerfvogel <fvogelnew1@free.fr>2016-03-27 09:58:56 (GMT)
commit5ac79af4213e794b4c9c7ab9a6a91232750d2320 (patch)
tree0e5acf120d43a07e1d5a9718964212d7cc257500 /win
parent0656d9cec23efaed108751cc6b6de4bd39d92a82 (diff)
parenta18a6b78143b5f399a00d03db1ede6d1f8776de0 (diff)
downloadtk-5ac79af4213e794b4c9c7ab9a6a91232750d2320.zip
tk-5ac79af4213e794b4c9c7ab9a6a91232750d2320.tar.gz
tk-5ac79af4213e794b4c9c7ab9a6a91232750d2320.tar.bz2
Fixed bug [1192095] - Toplevel menus return incorrect active index
Diffstat (limited to 'win')
-rw-r--r--win/tkWinMenu.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 8eede75..8e14669 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -1288,7 +1288,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];