summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2010-08-03 23:12:06 (GMT)
committerhobbs <hobbs>2010-08-03 23:12:06 (GMT)
commit0e850288ea94991aeaa4fdc8c6a208ff41aef956 (patch)
treeb038d9c6b72627109ef4b9ccea0e1520d4060b30
parenta0f7db1380a56dcd83cf94bda66ba3d1bec518f5 (diff)
downloadtk-0e850288ea94991aeaa4fdc8c6a208ff41aef956.zip
tk-0e850288ea94991aeaa4fdc8c6a208ff41aef956.tar.gz
tk-0e850288ea94991aeaa4fdc8c6a208ff41aef956.tar.bz2
* library/button.tcl (::tk::CheckEnter): use uplevel set instead
of set :: to work with other var resolvers (itcl). [AS Bug#87409]
-rw-r--r--ChangeLog5
-rw-r--r--library/button.tcl6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d6e8f63..315088a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-03 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * library/button.tcl (::tk::CheckEnter): use uplevel set instead
+ of set :: to work with other var resolvers (itcl). [AS Bug#87409]
+
2010-08-03 Don Porter <dgp@users.sourceforge.net>
* changes: Updated for 8.5.9 release.
diff --git a/library/button.tcl b/library/button.tcl
index 6560dc1..abad17f 100644
--- a/library/button.tcl
+++ b/library/button.tcl
@@ -4,7 +4,7 @@
# checkbutton, and radiobutton widgets and provides procedures
# that help in implementing those bindings.
#
-# RCS: @(#) $Id: button.tcl,v 1.19.4.2 2010/05/03 12:06:14 dkf Exp $
+# RCS: @(#) $Id: button.tcl,v 1.19.4.3 2010/08/03 23:12:06 hobbs Exp $
#
# Copyright (c) 1992-1994 The Regents of the University of California.
# Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -704,7 +704,9 @@ proc ::tk::CheckEnter {w} {
set Priv($w,aselectcolor) \
[format "#%04x%04x%04x" [expr {($r1+$r2)/2}] \
[expr {($g1+$g2)/2}] [expr {($b1+$b2)/2}]]
- if {[set ::[$w cget -variable]] eq [$w cget -onvalue]} {
+ # use uplevel to work with other var resolvers
+ if {[uplevel #0 [list set [$w cget -variable]]]
+ eq [$w cget -onvalue]} {
$w configure -selectcolor $Priv($w,aselectcolor)
}
}