diff options
| author | ericm <ericm> | 2000-03-02 03:02:13 (GMT) |
|---|---|---|
| committer | ericm <ericm> | 2000-03-02 03:02:13 (GMT) |
| commit | f5534ea9d060d3d5b81d439bbf781a792fd9b950 (patch) | |
| tree | e4711d8e6bdf036a7da62c6cf9c35b20d05802ce /library | |
| parent | 9ddd72d5fb7e050ceacbb03b2b3ab4a6bc01d40e (diff) | |
| download | tk-f5534ea9d060d3d5b81d439bbf781a792fd9b950.zip tk-f5534ea9d060d3d5b81d439bbf781a792fd9b950.tar.gz tk-f5534ea9d060d3d5b81d439bbf781a792fd9b950.tar.bz2 | |
* tests/clrpick.test:
* library/clrpick.tcl: Added code to make color chooser dialog
inherit screen setting from parent (bug #2334)
Diffstat (limited to 'library')
| -rw-r--r-- | library/choosedir.tcl | 6 | ||||
| -rw-r--r-- | library/clrpick.tcl | 14 |
2 files changed, 15 insertions, 5 deletions
diff --git a/library/choosedir.tcl b/library/choosedir.tcl index 6ccbb9f..659870c 100644 --- a/library/choosedir.tcl +++ b/library/choosedir.tcl @@ -6,7 +6,7 @@ # Copyright (c) 1998-2000 by Scriptics Corporation.
# All rights reserved.
#
-# RCS: @(#) $Id: choosedir.tcl,v 1.3 2000/02/14 22:00:17 ericm Exp $
+# RCS: @(#) $Id: choosedir.tcl,v 1.4 2000/03/02 03:02:13 ericm Exp $
# Make sure the tk::dialog namespace, in which all dialogs should live, exists
namespace eval ::tk::dialog {}
@@ -65,6 +65,10 @@ proc ::tk::dialog::chooseDir::tkChooseDirectory { args } { set opts(-parent) ""
}
+ if { [string equal $opts(-initialdir) ""] } {
+ set opts(-initialdir) [pwd]
+ }
+
set w [toplevel $opts(-parent).choosedirectory]
wm title $w $opts(-title)
diff --git a/library/clrpick.tcl b/library/clrpick.tcl index 76c2e99..72f3282 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.7 1999/11/24 20:59:06 hobbs Exp $ +# RCS: @(#) $Id: clrpick.tcl,v 1.8 2000/03/02 03:02:13 ericm Exp $ # # Copyright (c) 1996 Sun Microsystems, Inc. # @@ -59,10 +59,16 @@ proc tkColorDialog {args} { tkColorDialog_Config $w $args tkColorDialog_InitValues $w - if {![winfo exists $w]} { - toplevel $w -class tkColorDialog + set sc [$data(-parent) cget -screen] + set winExists [winfo exists $w] + if {!$winExists || [string compare $sc [$w cget -screen]]} { + if {$winExists} { + destroy $w + } + toplevel $w -class tkColorDialog -screen $sc tkColorDialog_BuildDialog $w } + wm transient $w $data(-parent) # 5. Withdraw the window, then update all the geometry information @@ -82,7 +88,7 @@ proc tkColorDialog {args} { # may take the focus away so we can't redirect it. Finally, # restore any grab that was in effect. - tkwait variable tkPriv(selectColor) + vwait tkPriv(selectColor) ::tk::RestoreFocusGrab $w $data(okBtn) unset data |