diff options
| author | jenglish <jenglish@noemail.net> | 2012-01-30 19:44:38 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@noemail.net> | 2012-01-30 19:44:38 (GMT) |
| commit | a69d2cc51d6f0f7df371c26072d91b7f8b9c3b99 (patch) | |
| tree | 8736c7cb34eb60fef9e63ddc080f3d4f09b80ae2 /library/ttk | |
| parent | da25a7797c2973374084e2d355ac41ae55146902 (diff) | |
| download | tk-a69d2cc51d6f0f7df371c26072d91b7f8b9c3b99.zip tk-a69d2cc51d6f0f7df371c26072d91b7f8b9c3b99.tar.gz tk-a69d2cc51d6f0f7df371c26072d91b7f8b9c3b99.tar.bz2 | |
ttk::combobox::Press: Don't take focus in disabled state [Bug 2925561].
FossilOrigin-Name: dfb108b671df74557c9d10e49df49b99cdb4e375
Diffstat (limited to 'library/ttk')
| -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 |