diff options
| -rw-r--r-- | ChangeLog | 59 | ||||
| -rw-r--r-- | library/button.tcl | 6 |
2 files changed, 36 insertions, 29 deletions
@@ -1,10 +1,17 @@ +2010-05-03 Donal K. Fellows <dkf@users.sf.net> + + * library/button.tcl (CheckInvoke, CheckEnter): [Patch 1530276 redux]: + Apply a bit more care to ensure that things continue to work correctly + even when there is no -selectcolor defined. + 2010-04-19 Jan Nijtmans <nijtmans@users.sf.net> - * win/tkWinPort.h Fix [Patch 2986105]: conditionally defining + * win/tkWinPort.h: Fix [Patch 2986105]: conditionally defining strcasecmp/strncasecmp - * win/tkWinDialog.c Fix [Bug 2987995]: Tk_GetOpenFile returns garbage + * win/tkWinDialog.c: Fix [Bug 2987995]: Tk_GetOpenFile returns garbage under described circumstances, minor formatting. - * win/tkWinDialog.c [Patch 2898255]: Filenames limit with Tk_GetFileName() + * win/tkWinDialog.c: [Patch 2898255]: Filenames limit with + Tk_GetFileName(). Assure modern style dialogs where available 2010-03-12 Jan Nijtmans <nijtmans@users.sf.net> @@ -47,8 +54,8 @@ 2010-02-19 Stuart Cassoff <stwo@users.sourceforge.net> - * tcl.m4: Correct compiler/linker flags - for threaded builds on OpenBSD. + * tcl.m4: Correct compiler/linker flags for threaded builds on + OpenBSD. * configure: (regenerated). 2010-02-17 Joe English <jenglish@users.sourceforge.net> @@ -59,22 +66,22 @@ 2010-02-16 Jan Nijtmans <nijtmans@users.sf.net> - * unix/tkUnixWm.c make TkSetTransientFor static + * unix/tkUnixWm.c: Make TkSetTransientFor static 2010-02-07 Jan Nijtmans <nijtmans@users.sf.net> - * generic/ttk/ttkGenStubs.tcl Backport various formatting (spacing) - * generic/ttk/ttk.decls changes from HEAD, so diffing - * generic/ttk/ttkDecls.h between 8.5.x and 8.6 shows the - * generic/tk*.decls real structural differences again. - * generic/tk*Decls.h (any signature change not backported!) + * generic/ttk/ttkGenStubs.tcl: Backport various formatting (spacing) + * generic/ttk/ttk.decls: changes from HEAD, so diffing + * generic/ttk/ttkDecls.h: between 8.5.x and 8.6 shows the + * generic/tk*.decls: real structural differences again. + * generic/tk*Decls.h: (any signature change not backported!) 2010-01-29 Jan Nijtmans <nijtmans@users.sf.net> - * generic/tkBind.c Fix various gcc-4.4 warnings, all - * generic/tkListbox.c backported from HEAD. - * generic/tkText.c - * generic/ttk/ttkInit.c + * generic/tkBind.c: Fix various gcc-4.4 warnings, all + * generic/tkListbox.c: backported from HEAD. + * generic/tkText.c: + * generic/ttk/ttkInit.c: 2010-01-20 Pat Thoyts <patthoyts@users.sourceforge.net> @@ -105,12 +112,12 @@ * library/obsolete.tcl: the .help menu on X11. * unix/tkUnixMenu.c: - * library/menu.tcl: [TIP 360] Make Tk menu activation + * library/menu.tcl: [TIP 360]: Make Tk menu activation * library/obsolete.tcl: follow mouse movements. 2010-01-08 Pat Thoyts <patthoyts@users.sourceforge.net> - * doc/photo.n: [Bug 2927569] Multiple edits have peverted the + * doc/photo.n: [Bug 2927569]: Multiple edits have peverted the original meaning of the phrase 'image file data' to reference a filename option that does not exist. @@ -122,13 +129,13 @@ 2010-01-06 Jan Nijtmans <nijtmans@users.sf.net> - * unix/tcl.m4 Sync with Tcl version - * unix/configure (regenerated) - * unix/Makefile.in - * unix/.cvsignore - * generic/default.h Trivial CYGWIN fixes - * generic/tkWindow.c - * doc/.cvsignore + * unix/tcl.m4: Sync with Tcl version + * unix/configure: (regenerated) + * unix/Makefile.in: + * unix/.cvsignore: + * generic/default.h: Trivial CYGWIN fixes + * generic/tkWindow.c: + * doc/.cvsignore: 2010-01-06 Donal K. Fellows <dkf@users.sf.net> @@ -529,8 +536,8 @@ 2009-06-27 Jan Nijtmans <nijtmans@users.sf.net> * generic/tkInt.decls (Tk(Orient|Smooth)(Parse|Print)Proc): - Backport [Bug 2804935]: Expose these functions through - the internal stub table as they are useful to existing third-party code. + Backport [Bug 2804935]: Expose these functions through the internal + stub table as they are useful to existing third-party code. 2009-06-23 Jan Nijtmans <nijtmans@users.sf.net> diff --git a/library/button.tcl b/library/button.tcl index 0d493fb..6560dc1 100644 --- a/library/button.tcl +++ b/library/button.tcl @@ -4,7 +4,7 @@ # checkbutton, and radiobutton widgets and provides procedures # that help in implementing those bindings. # -# RCS: @(#) $Id: button.tcl,v 1.19.4.1 2009/10/24 00:12:03 dkf Exp $ +# RCS: @(#) $Id: button.tcl,v 1.19.4.2 2010/05/03 12:06:14 dkf Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -659,7 +659,7 @@ proc ::tk::CheckInvoke {w} { # Additional logic to switch the "selected" colors around if necessary # (when we're indicator-less). - if {![$w cget -indicatoron]} { + if {![$w cget -indicatoron] && [info exist Priv($w,selectcolor)]} { if {[$w cget -selectcolor] eq $Priv($w,aselectcolor)} { $w configure -selectcolor $Priv($w,selectcolor) } else { @@ -697,7 +697,7 @@ proc ::tk::CheckEnter {w} { # Compute what the "selected and active" color should be. - if {![$w cget -indicatoron]} { + if {![$w cget -indicatoron] && [$w cget -selectcolor] ne ""} { set Priv($w,selectcolor) [$w cget -selectcolor] lassign [winfo rgb $w [$w cget -selectcolor]] r1 g1 b1 lassign [winfo rgb $w [$w cget -activebackground]] r2 g2 b2 |