summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorericm <ericm>2000-01-21 22:44:40 (GMT)
committerericm <ericm>2000-01-21 22:44:40 (GMT)
commitaa3710e2c145ee2478db5c698bc2a6ff47911f9b (patch)
tree3e9819385be4328b9a43ead8d1706b76364be2bf
parent809ff15f94c450ae08db7edb4c6c0d405760664e (diff)
downloadtk-aa3710e2c145ee2478db5c698bc2a6ff47911f9b.zip
tk-aa3710e2c145ee2478db5c698bc2a6ff47911f9b.tar.gz
tk-aa3710e2c145ee2478db5c698bc2a6ff47911f9b.tar.bz2
* library/tkfbox.tcl: Fixed bug relating to incorrect parent
values for error message boxes displayed by the file dialog (bug #3616).
-rw-r--r--ChangeLog10
-rw-r--r--library/tkfbox.tcl16
2 files changed, 18 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 2998330..c004176 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-01-21 Eric Melski <ericm@scriptics.com>
+
+ * library/tkfbox.tcl: Fixed bug relating to incorrect parent
+ values for error message boxes displayed by the file dialog (bug
+ #3616).
+
+ * tests/text.test:
+ * generic/tkText.c: Fixed bug relating to regexp searching for
+ empty lines; previously, the starting line was ignored. (bug #1643).
+
2000-01-20 Jeff Hobbs <hobbs@scriptics.com>
* library/text.tcl: fixed double-click selection behavior where
diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl
index ef17c61..c5ffc87 100644
--- a/library/tkfbox.tcl
+++ b/library/tkfbox.tcl
@@ -11,7 +11,7 @@
# files by clicking on the file icons or by entering a filename
# in the "Filename:" entry.
#
-# RCS: @(#) $Id: tkfbox.tcl,v 1.13 2000/01/06 02:22:25 hobbs Exp $
+# RCS: @(#) $Id: tkfbox.tcl,v 1.14 2000/01/21 22:44:42 ericm Exp $
#
# Copyright (c) 1994-1998 Sun Microsystems, Inc.
#
@@ -975,7 +975,7 @@ rSASvJTGhnhcV3EJlo3kh53ltF5nAhQAOw==}]
# should have been checked before tkFDialog_Update is called, so
# we normally won't come to here. Anyways, give an error and abort
# action.
- tk_messageBox -type ok -parent $data(-parent) -message \
+ tk_messageBox -type ok -parent $w -message \
"Cannot change to the directory \"$data(selectPath)\".\nPermission denied."\
-icon warning
cd $appPWD
@@ -1255,7 +1255,7 @@ proc tkFDialog_ActivateEnt {w} {
}
FILE {
if {[string equal $data(type) open]} {
- tk_messageBox -icon warning -type ok -parent $data(-parent) \
+ tk_messageBox -icon warning -type ok -parent $w \
-message "File \"[file join $path $file]\" does not exist."
$data(ent) selection range 0 end
$data(ent) icursor end
@@ -1266,20 +1266,20 @@ proc tkFDialog_ActivateEnt {w} {
}
}
PATH {
- tk_messageBox -icon warning -type ok -parent $data(-parent) \
+ tk_messageBox -icon warning -type ok -parent $w \
-message "Directory \"$path\" does not exist."
$data(ent) selection range 0 end
$data(ent) icursor end
}
CHDIR {
- tk_messageBox -type ok -parent $data(-parent) -message \
+ tk_messageBox -type ok -parent $w -message \
"Cannot change to the directory \"$path\".\nPermission denied."\
-icon warning
$data(ent) selection range 0 end
$data(ent) icursor end
}
ERROR {
- tk_messageBox -type ok -parent $data(-parent) -message \
+ tk_messageBox -type ok -parent $w -message \
"Invalid file name \"$path\"."\
-icon warning
$data(ent) selection range 0 end
@@ -1387,7 +1387,7 @@ proc tkFDialog_ListInvoke {w text} {
if {[file isdirectory $file]} {
set appPWD [pwd]
if {[catch {cd $file}]} {
- tk_messageBox -type ok -parent $data(-parent) -message \
+ tk_messageBox -type ok -parent $w -message \
"Cannot change to the directory \"$file\".\nPermission denied."\
-icon warning
} else {
@@ -1420,7 +1420,7 @@ proc tkFDialog_Done {w {selectFilePath ""}} {
if {[file exists $selectFilePath] && [string equal $data(type) save]} {
set reply [tk_messageBox -icon warning -type yesno\
- -parent $data(-parent) -message "File\
+ -parent $w -message "File\
\"$selectFilePath\" already exists.\nDo\
you want to overwrite it?"]
if {[string equal $reply "no"]} {