From cfc76bc01aeffb83ef3ff53b747af3736321857c Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Tue, 3 Aug 2010 23:13:03 +0000
Subject:         * library/button.tcl (::tk::CheckEnter): use uplevel set
 instead         of set :: to work with other var resolvers (itcl). [AS
 Bug#87409]

---
 ChangeLog          | 5 +++++
 library/button.tcl | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4c6e993..10dea3a 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-07-19  Donal K. Fellows  <dkf@users.sf.net>
 
 	* generic/tkImgGIF.c (StringWriteGIF): Added ability to write a GIF to
diff --git a/library/button.tcl b/library/button.tcl
index 4b35281..54929d1 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.21 2010/05/03 11:59:11 dkf Exp $
+# RCS: @(#) $Id: button.tcl,v 1.22 2010/08/03 23:13:03 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)
 	    }
 	}
-- 
cgit v0.12