Update palette.tcl

1 files changed, 16 insertions, 11 deletions

diff --git a/library/palette.tcl b/library/palette.tcl
index 90b499b..d07f894 100644
--- a/library/palette.tcl
+++ b/library/palette.tcl
@@ -189,6 +189,9 @@ proc ::tk_setPalette {args} {
 #			which contains color information.  Each element
 #			is named after a widget configuration option, and
 #			each value is the value for that option.
+# Return Value:
+#                       A list of commands which can be run to update
+#                       the defaults database when exec'ed.
 
 proc ::tk::RecolorTree {w colors} {
     upvar $colors c
@@ -200,11 +203,14 @@ proc ::tk::RecolorTree {w colors} {
     foreach dbOption [array names c] {
 	set option -[string tolower $dbOption]
 	set class [string replace $dbOption 0 0 [string toupper \
-		[string index $dbOption 0]]]
+	     [string index $dbOption 0]]]
+	# Make sure this option is valid for this window.
 	if {![catch {$w configure $option} value]} {
-	    # if the option database has a preference for this
-	    # dbOption, then use it, otherwise use the defaults
-	    # for the widget.
+	    # Update the option for this window.
+	    $w configure $option $c($dbOption)
+	    # Retrieve a default value for this option.  First check
+	    # the option database. If it is not in the database use
+	    # the value for the temporary prototype widget.
 	    set defaultcolor [option get $w $dbOption $class]
 	    if {$defaultcolor eq "" || \
 		    ([info exists prototype] && \
@@ -214,16 +220,15 @@ proc ::tk::RecolorTree {w colors} {
 	    if {$defaultcolor ne ""} {
 		set defaultcolor [winfo rgb . $defaultcolor]
 	    }
-	    set chosencolor [lindex $value 4]
-	    if {$chosencolor ne ""} {
-		set chosencolor [winfo rgb . $chosencolor]
+	    # If the color requested for this option differs from
+	    # the default, append a command to update the default.
+	    set requestcolor [lindex $value 4]
+	    if {$requestcolor ne ""} {
+		set requestcolor [winfo rgb . $requestcolor]
 	    }
-	    if {[string match $defaultcolor $chosencolor]} {
-		# Change the option database so that future windows will get
-		# the same colors.
+	    if {![string match $defaultcolor $requestcolor]} {
 		append result ";\noption add [list \
 		    *[winfo class $w].$dbOption $c($dbOption) 60]"
-		$w configure $option $c($dbOption)
 	    }
 	}
     }