summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2007-05-09 12:51:55 (GMT)
committerdas <das>2007-05-09 12:51:55 (GMT)
commite34afd70d21dec5f26e8f60db0ea38ff755af2d3 (patch)
tree56a8a687245e49e85dd8bee5e6218fe7778e058e
parent8a9b564349c8e0c0ec7f5c1a97e0c29276188ea0 (diff)
downloadtk-e34afd70d21dec5f26e8f60db0ea38ff755af2d3.zip
tk-e34afd70d21dec5f26e8f60db0ea38ff755af2d3.tar.gz
tk-e34afd70d21dec5f26e8f60db0ea38ff755af2d3.tar.bz2
* library/palette.tcl (tk::RecolorTree): handle color options with
empty value, fixes error due to emtpy -selectforeground (reported on tcl-mac by Russel E. Owen).
-rw-r--r--library/palette.tcl12
1 files changed, 8 insertions, 4 deletions
diff --git a/library/palette.tcl b/library/palette.tcl
index 323d372..eae93d9 100644
--- a/library/palette.tcl
+++ b/library/palette.tcl
@@ -3,7 +3,7 @@
# This file contains procedures that change the color palette used
# by Tk.
#
-# RCS: @(#) $Id: palette.tcl,v 1.11 2006/03/17 11:13:15 patthoyts Exp $
+# RCS: @(#) $Id: palette.tcl,v 1.12 2007/05/09 12:51:55 das Exp $
#
# Copyright (c) 1995-1997 Sun Microsystems, Inc.
#
@@ -179,11 +179,15 @@ proc ::tk::RecolorTree {w colors} {
if {$defaultcolor eq "" || \
([info exists prototype] && \
[$prototype cget $option] ne "$defaultcolor")} {
- set defaultcolor [winfo rgb . [lindex $value 3]]
- } else {
+ set defaultcolor [lindex $value 3]
+ }
+ if {$defaultcolor ne ""} {
set defaultcolor [winfo rgb . $defaultcolor]
}
- set chosencolor [winfo rgb . [lindex $value 4]]
+ set chosencolor [lindex $value 4]
+ if {$chosencolor ne ""} {
+ set chosencolor [winfo rgb . $chosencolor]
+ }
if {[string match $defaultcolor $chosencolor]} {
# Change the option database so that future windows will get
# the same colors.