diff options
| author | jenglish@flightlab.com <jenglish> | 2012-01-30 19:50:29 (GMT) |
|---|---|---|
| committer | jenglish@flightlab.com <jenglish> | 2012-01-30 19:50:29 (GMT) |
| commit | 302960dd988e1461cca5bdf445014bc2e22c63ff (patch) | |
| tree | ca0bacc831b31e0435dfba353ef344aa3a5c14c6 /library/ttk | |
| parent | 242c0a3cb9a69d25df98d82632a0c9b3468b5588 (diff) | |
| parent | 9b04f34166cdc28ca43887963e2e5181aa3befcd (diff) | |
| download | tk-302960dd988e1461cca5bdf445014bc2e22c63ff.zip tk-302960dd988e1461cca5bdf445014bc2e22c63ff.tar.gz tk-302960dd988e1461cca5bdf445014bc2e22c63ff.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.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 |