summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--library/focus.tcl8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index aa3cc46..1eded23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-09 Jeff Hobbs <hobbs@scriptics.com>
+
+ * library/focus.tcl: fixed calling of takeFocus proc [Bug: 5372]
+
2000-05-02 Jeff Hobbs <hobbs@scriptics.com>
* README:
diff --git a/library/focus.tcl b/library/focus.tcl
index 1658988..9a03ea1 100644
--- a/library/focus.tcl
+++ b/library/focus.tcl
@@ -3,7 +3,7 @@
# This file defines several procedures for managing the input
# focus.
#
-# RCS: @(#) $Id: focus.tcl,v 1.7 2000/03/31 09:24:11 hobbs Exp $
+# RCS: @(#) $Id: focus.tcl,v 1.8 2000/05/09 17:28:31 hobbs Exp $
#
# Copyright (c) 1994-1995 Sun Microsystems, Inc.
#
@@ -130,14 +130,14 @@ proc tk_focusPrev w {
proc tkFocusOK w {
set code [catch {$w cget -takefocus} value]
- if {($code == 0) && [string compare $value ""]} {
+ if {($code == 0) && ($value != "")} {
if {$value == 0} {
return 0
} elseif {$value == 1} {
return [winfo viewable $w]
} else {
- set value [uplevel #0 [list $value $w]]
- if {[string compare $value ""]} {
+ set value [uplevel #0 $value [list $w]]
+ if {$value != ""} {
return $value
}
}