summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2007-10-30 19:56:58 (GMT)
committerhobbs <hobbs>2007-10-30 19:56:58 (GMT)
commite3d080ec8d965eb9ad0e606c90f01b9af73facb3 (patch)
treec73e4df7584a04457bb500a0b27d80d19c5bb76e
parent1ab1b5398ef7d9ba7ab275f8d79abf3225708bb5 (diff)
downloadtk-e3d080ec8d965eb9ad0e606c90f01b9af73facb3.zip
tk-e3d080ec8d965eb9ad0e606c90f01b9af73facb3.tar.gz
tk-e3d080ec8d965eb9ad0e606c90f01b9af73facb3.tar.bz2
* library/listbox.tcl (::tk::ListboxBeginSelect): ignore
-takefocus when considering focus on <1>, it is for tab focus.
-rw-r--r--ChangeLog5
-rw-r--r--library/listbox.tcl6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2af1208..fc2fd75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-30 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * library/listbox.tcl (::tk::ListboxBeginSelect): ignore
+ -takefocus when considering focus on <1>, it is for tab focus.
+
2007-10-30 Don Porter <dgp@users.sourceforge.net>
* generic/tk.h: Bump version number to 8.5b2.1 to distinguish
diff --git a/library/listbox.tcl b/library/listbox.tcl
index 26f494e..c6b47b5 100644
--- a/library/listbox.tcl
+++ b/library/listbox.tcl
@@ -3,7 +3,7 @@
# This file defines the default bindings for Tk listbox widgets
# and provides procedures that help in implementing those bindings.
#
-# RCS: @(#) $Id: listbox.tcl,v 1.16 2007/10/30 01:57:54 hobbs Exp $
+# RCS: @(#) $Id: listbox.tcl,v 1.17 2007/10/30 19:56:58 hobbs Exp $
#
# Copyright (c) 1994 The Regents of the University of California.
# Copyright (c) 1994-1995 Sun Microsystems, Inc.
@@ -244,9 +244,7 @@ proc ::tk::ListboxBeginSelect {w el {focus 1}} {
}
event generate $w <<ListboxSelect>>
# check existence as ListboxSelect may destroy us
- if {$focus && [winfo exists $w]
- && [string is true -strict [$w cget -takefocus]]
- && [$w cget -state] eq "normal"} {
+ if {$focus && [winfo exists $w] && [$w cget -state] eq "normal"} {
focus $w
}
}