From 84a5fb4ee633395484b17c75e19ae52a67eb07b9 Mon Sep 17 00:00:00 2001 From: jenglish Date: Tue, 11 Jun 2002 18:59:25 +0000 Subject: fix for bug report #530212 "Bad Window Path Name in tkMenuFind" FossilOrigin-Name: ec3df4860b616cfa4a960b17f9cfd4519a2afb67 --- ChangeLog | 4 ++++ library/menu.tcl | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3338b0b..c74e70e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-06-11 Joe English + * library/menu.tcl: fix for bug report #530212 "Bad Window Path + Name in tkMenuFind" + 2002-06-10 David Gravereaux * win/makefile.vc: Fixed a win98 issue where the /exclude option diff --git a/library/menu.tcl b/library/menu.tcl index 5f7352b..e0c1fe9 100644 --- a/library/menu.tcl +++ b/library/menu.tcl @@ -4,7 +4,7 @@ # It also implements keyboard traversal of menus and implements a few # other utility procedures related to menus. # -# RCS: @(#) $Id: menu.tcl,v 1.15 2001/11/27 14:08:04 drh Exp $ +# RCS: @(#) $Id: menu.tcl,v 1.16 2002/06/11 18:59:25 jenglish Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1997 Sun Microsystems, Inc. @@ -920,8 +920,7 @@ proc ::tk::MenuFind {w char} { foreach child $windowlist { # Don't descend into other toplevels. - if {[string compare [winfo toplevel [focus]] \ - [winfo toplevel $child]]} { + if {[string compare [winfo toplevel $w] [winfo toplevel $child]]} { continue } if {[string equal [winfo class $child] "Menu"] && \ @@ -948,8 +947,7 @@ proc ::tk::MenuFind {w char} { foreach child $windowlist { # Don't descend into other toplevels. - if {[string compare [winfo toplevel [focus]] \ - [winfo toplevel $child]]} { + if {[string compare [winfo toplevel $w] [winfo toplevel $child]]} { continue } switch [winfo class $child] { -- cgit v0.12