summaryrefslogtreecommitdiffstats
path: root/library/menu.tcl
diff options
context:
space:
mode:
authorhobbs <hobbs@noemail.net>2000-03-31 09:24:11 (GMT)
committerhobbs <hobbs@noemail.net>2000-03-31 09:24:11 (GMT)
commit1728d5b52a0610d52afa04aef5de7e1ccf0d2faf (patch)
tree57e934ce1272a995275eac17554aa82bf3637924 /library/menu.tcl
parentddc95f3f022fa2e836d662071c3ab50ff0c98e62 (diff)
downloadtk-1728d5b52a0610d52afa04aef5de7e1ccf0d2faf.zip
tk-1728d5b52a0610d52afa04aef5de7e1ccf0d2faf.tar.gz
tk-1728d5b52a0610d52afa04aef5de7e1ccf0d2faf.tar.bz2
* library/menu.tcl (tkMenuInvoke): corrected naming of tearoffs
[Bug: 4506] * library/tkfbox.tcl (tkIconList_Goto): caused browsecmd to be called in tkIconList_Select. This causes the entry to be set properly when using the type-in-name-in-listbox bindings. FossilOrigin-Name: 4a69b854d6281d40ac0f7889086ef830eb652119
Diffstat (limited to 'library/menu.tcl')
-rw-r--r--library/menu.tcl10
1 files changed, 5 insertions, 5 deletions
diff --git a/library/menu.tcl b/library/menu.tcl
index 00c0e4c..6899b10 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.10 2000/03/10 22:16:36 ericm Exp $
+# RCS: @(#) $Id: menu.tcl,v 1.11 2000/03/31 09:24:11 hobbs Exp $
#
# Copyright (c) 1992-1994 The Regents of the University of California.
# Copyright (c) 1994-1997 Sun Microsystems, Inc.
@@ -405,7 +405,7 @@ proc tkMenuUnpost menu {
# including the top-level torn-off one) and deactivate the
# top-level torn off menu if there is one.
- while 1 {
+ while {1} {
set parent [winfo parent $menu]
if {[string compare [winfo class $parent] "Menu"] \
|| ![winfo ismapped $parent]} {
@@ -651,8 +651,8 @@ proc tkMenuInvoke {w buttonRelease} {
set menu [$w entrycget active -menu]
tkMenuFirstEntry $menu
} elseif {[string equal [$w type active] "tearoff"]} {
- tkMenuUnpost $w
tkTearOffMenu $w
+ tkMenuUnpost $w
} elseif {[string equal [$w cget -type] "menubar"]} {
$w postcascade none
$w activate none
@@ -795,7 +795,7 @@ proc tkMenuNextMenu {menu direction} {
set buttons [winfo children [winfo parent $w]]
set length [llength $buttons]
set i [expr {[lsearch -exact $buttons $w] + $count}]
- while 1 {
+ while {1} {
while {$i < 0} {
incr i $length
}
@@ -841,7 +841,7 @@ proc tkMenuNextEntry {menu count} {
} else {
set i [expr {$active + $count}]
}
- while 1 {
+ while {1} {
if {$quitAfter <= 0} {
# We've tried every entry in the menu. Either there are
# none, or they're all disabled. Just give up.