diff options
| author | stanton <stanton> | 1999-04-16 01:51:06 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1999-04-16 01:51:06 (GMT) |
| commit | 03656f44f81469f459031fa3a4a7b09c8bc77712 (patch) | |
| tree | 31378e81bd58f8c726fc552d6b30cbf3ca07497b /library/clrpick.tcl | |
| parent | 404fc236f34304df53b7e44bc7971d786b87d453 (diff) | |
| download | tk-03656f44f81469f459031fa3a4a7b09c8bc77712.zip tk-03656f44f81469f459031fa3a4a7b09c8bc77712.tar.gz tk-03656f44f81469f459031fa3a4a7b09c8bc77712.tar.bz2 | |
* Merged 8.1 branch into the main trunk
Diffstat (limited to 'library/clrpick.tcl')
| -rw-r--r-- | library/clrpick.tcl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/library/clrpick.tcl b/library/clrpick.tcl index 7e56626..8f08324 100644 --- a/library/clrpick.tcl +++ b/library/clrpick.tcl @@ -3,7 +3,7 @@ # Color selection dialog for platforms that do not support a # standard color selection dialog. # -# RCS: @(#) $Id: clrpick.tcl,v 1.3 1998/09/14 18:23:22 stanton Exp $ +# RCS: @(#) $Id: clrpick.tcl,v 1.4 1999/04/16 01:51:26 stanton Exp $ # # Copyright (c) 1996 Sun Microsystems, Inc. # @@ -84,7 +84,7 @@ proc tkColorDialog {args} { set oldFocus [focus] set oldGrab [grab current $w] - if {$oldGrab != ""} { + if {[string compare $oldGrab ""]} { set grabStatus [grab status $oldGrab] } grab $w @@ -101,8 +101,8 @@ proc tkColorDialog {args} { grab release $w destroy $w unset data - if {$oldGrab != ""} { - if {$grabStatus == "global"} { + if {[string compare $oldGrab ""]} { + if {![string compare $grabStatus "global"]} { grab -global $oldGrab } else { grab $oldGrab |