Tk Source Code

Changes On Branch bug-6286fda787
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch bug-6286fda787 Excluding Merge-Ins

This is equivalent to a diff from a3572e7e to 9bc87fc2

2019-04-28
16:17
Fix [6286fda787]: unix: checkbutton -selectcolor not restored properly when changed in -command. Patch by ralfixx check-in: f916116a user: fvogel tags: core-8-6-branch
2019-04-20
03:40
On macOS, squelch more availability warnings. Fix a hard to find bug [40ada90762] which could sometimes cause a segfault. check-in: 663e4bc3 user: culler tags: core-8-6-branch
2019-04-19
21:19
Test using a semaphore to prevent macOS crashes if drawRect is called during destruction of a widget. Closed-Leaf check-in: 5574017c user: culler tags: mac-semaphore
21:01
Fix [6286fda787]: unix: checkbutton -selectcolor not restored properly when changed in -command. Patch by ralfixx Closed-Leaf check-in: 9bc87fc2 user: fvogel tags: bug-6286fda787
19:04
Put the brace outside the #endif where it belongs. check-in: c3d70a12 user: culler tags: trunk
19:03
Put the brace outside the #endif where it belongs. check-in: a3572e7e user: culler tags: core-8-6-branch
14:40
Fine tune aqua ttk colors. Fix availability errors introduced in 6cafd6f7. check-in: d26b28ae user: culler tags: core-8-6-branch

Changes to library/button.tcl.
744
745
746
747
748
749
750
751
752
753
754



755

756
757
758
759
760
761
762

proc ::tk::CheckLeave {w} {
    variable ::tk::Priv
    if {[$w cget -state] ne "disabled"} {
	$w configure -state normal
    }

    # Restore the original button "selected" color; assume that the user
    # wasn't monkeying around with things too much.

    if {![$w cget -indicatoron] && [info exist Priv($w,selectcolor)]} {



	$w configure -selectcolor $Priv($w,selectcolor)

    }
    unset -nocomplain Priv($w,selectcolor) Priv($w,aselectcolor)

    # Restore the original button relief if it was changed by Tk. That is
    # signaled by the existence of Priv($w,prelief).

    if {[info exists Priv($w,relief)]} {







|
|


>
>
>
|
>







744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766

proc ::tk::CheckLeave {w} {
    variable ::tk::Priv
    if {[$w cget -state] ne "disabled"} {
	$w configure -state normal
    }

    # 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)]} {
        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)

    # Restore the original button relief if it was changed by Tk. That is
    # signaled by the existence of Priv($w,prelief).

    if {[info exists Priv($w,relief)]} {