From c91f8973c04a4f3c48dd907359c7c98042e5d976 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Wed, 9 May 2007 12:56:32 +0000
Subject: 	* 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).

---
 library/palette.tcl | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/library/palette.tcl b/library/palette.tcl
index c53fad5..b294abc 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.8.2.2 2006/03/17 10:50:11 patthoyts Exp $
+# RCS: @(#) $Id: palette.tcl,v 1.8.2.3 2007/05/09 12:56:32 das Exp $
 #
 # Copyright (c) 1995-1997 Sun Microsystems, Inc.
 #
@@ -181,11 +181,15 @@ proc ::tk::RecolorTree {w colors} {
 	    if {[string match {} $defaultcolor] || \
 		    ([info exists prototype] && \
 		    [$prototype cget $option] ne "$defaultcolor")} {
-		set defaultcolor [winfo rgb . [lindex $value 3]]
-	    } else {
+		set defaultcolor [lindex $value 3]
+	    }
+	    if {![string match {} $defaultcolor]} {
 		set defaultcolor [winfo rgb . $defaultcolor]
 	    }
-	    set chosencolor [winfo rgb . [lindex $value 4]]
+	    set chosencolor [lindex $value 4]
+	    if {![string match {} $chosencolor]} {
+		set chosencolor [winfo rgb . $chosencolor]
+	    }
 	    if {[string match $defaultcolor $chosencolor]} {
 		# Change the option database so that future windows will get
 		# the same colors.
-- 
cgit v0.12