summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2012-01-30 19:50:29 (GMT)
committerjenglish <jenglish@flightlab.com>2012-01-30 19:50:29 (GMT)
commitaf35ce6a64f4b7491095ba1201ec2cb8759b27b9 (patch)
treeca0bacc831b31e0435dfba353ef344aa3a5c14c6 /library
parent15408cb5b1c3c082479bd6a2ae86cc37fd7028fa (diff)
parentb4f5df095c7b84b7aa277daf88a07e38f6e03abc (diff)
downloadtk-af35ce6a64f4b7491095ba1201ec2cb8759b27b9.zip
tk-af35ce6a64f4b7491095ba1201ec2cb8759b27b9.tar.gz
tk-af35ce6a64f4b7491095ba1201ec2cb8759b27b9.tar.bz2
ttk::combobox::Press: Don't take focus in disabled state [Bug 2925561].
Diffstat (limited to 'library')
-rw-r--r--library/ttk/combobox.tcl7
1 files changed, 5 insertions, 2 deletions
diff --git a/library/ttk/combobox.tcl b/library/ttk/combobox.tcl
index eab3e1a..03821a2 100644
--- a/library/ttk/combobox.tcl
+++ b/library/ttk/combobox.tcl
@@ -112,9 +112,12 @@ switch -- [tk windowingsystem] {
#
proc ttk::combobox::Press {mode w x y} {
variable State
+
+ $w instate disabled { return }
+
set State(entryPress) [expr {
- [$w instate {!readonly !disabled}]
- && [string match *textarea [$w identify $x $y]]
+ [$w instate !readonly]
+ && [string match *textarea [$w identify element $x $y]]
}]
focus $w