diff options
| author | jenglish <jenglish@noemail.net> | 2012-01-30 19:50:29 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@noemail.net> | 2012-01-30 19:50:29 (GMT) |
| commit | f47a144c268184e3af5f8c4d46b580da68e995fb (patch) | |
| tree | ca0bacc831b31e0435dfba353ef344aa3a5c14c6 /library | |
| parent | 1a6d62c5dca9ce2df6bbbc80a421ab57a9b08d74 (diff) | |
| parent | a69d2cc51d6f0f7df371c26072d91b7f8b9c3b99 (diff) | |
| download | tk-f47a144c268184e3af5f8c4d46b580da68e995fb.zip tk-f47a144c268184e3af5f8c4d46b580da68e995fb.tar.gz tk-f47a144c268184e3af5f8c4d46b580da68e995fb.tar.bz2 | |
ttk::combobox::Press: Don't take focus in disabled state [Bug 2925561].
FossilOrigin-Name: 0da69ac895f6edd530d0b0a6f8e97053affb8c30
Diffstat (limited to 'library')
| -rw-r--r-- | library/ttk/combobox.tcl | 7 |
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 |