summaryrefslogtreecommitdiffstats
path: root/library/ttk
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2012-01-30 19:44:38 (GMT)
committerjenglish <jenglish@flightlab.com>2012-01-30 19:44:38 (GMT)
commitb4f5df095c7b84b7aa277daf88a07e38f6e03abc (patch)
tree8736c7cb34eb60fef9e63ddc080f3d4f09b80ae2 /library/ttk
parent7636fd130439ccf2735dddd592ff733327b12951 (diff)
downloadtk-b4f5df095c7b84b7aa277daf88a07e38f6e03abc.zip
tk-b4f5df095c7b84b7aa277daf88a07e38f6e03abc.tar.gz
tk-b4f5df095c7b84b7aa277daf88a07e38f6e03abc.tar.bz2
ttk::combobox::Press: Don't take focus in disabled state [Bug 2925561].
Diffstat (limited to 'library/ttk')
-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