Import Tk 8.6.10

This commit is contained in:
Steve Dower
2020-09-24 22:55:34 +01:00
parent 5ba5cbc9af
commit 42c69189d9
365 changed files with 24323 additions and 12832 deletions

View File

@@ -748,11 +748,15 @@ proc ::tk::CheckLeave {w} {
$w configure -state normal
}
# Restore the original button "selected" color; assume that the user
# wasn't monkeying around with things too much.
# Restore the original button "selected" color; but only if the user
# has not changed it in the meantime.
if {![$w cget -indicatoron] && [info exist Priv($w,selectcolor)]} {
$w configure -selectcolor $Priv($w,selectcolor)
if {[$w cget -selectcolor] eq $Priv($w,selectcolor)
|| ([info exist Priv($w,aselectcolor)] &&
[$w cget -selectcolor] eq $Priv($w,aselectcolor))} {
$w configure -selectcolor $Priv($w,selectcolor)
}
}
unset -nocomplain Priv($w,selectcolor) Priv($w,aselectcolor)