summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2009-01-07 14:35:39 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2009-01-07 14:35:39 (GMT)
commitd03aad70ca68aa4c46be2ee07277dcf0f5cfe411 (patch)
tree96244c0d96511d9b8d025c31cfb8a28c21698481
parent114517ca2014f21586487d79a7362b44af6b3540 (diff)
downloadtk-d03aad70ca68aa4c46be2ee07277dcf0f5cfe411.zip
tk-d03aad70ca68aa4c46be2ee07277dcf0f5cfe411.tar.gz
tk-d03aad70ca68aa4c46be2ee07277dcf0f5cfe411.tar.bz2
Applied patch from [Bug 2473120] to fix the arguments to tk_messageBox call in the tk_chooseDirectory unix implementation.
-rw-r--r--ChangeLog2
-rw-r--r--library/tkfbox.tcl4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 342dbd6..bf127f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2009-01-07 Pat Thoyts <patthoyts@users.sourceforge.net>
+ * library/tkfbox.tcl: [Bug 2473120] mis-ordered messagebox args.
+
* win/tkWinWm.c: prevent grabs being bypassed on Windows [Bug 1847002]
2009-01-06 Jan Nijtmans <nijtmans@users.sf.net>
diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl
index 98cde58..03d8859 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.70 2008/12/11 18:13:08 jenglish Exp $
+# RCS: @(#) $Id: tkfbox.tcl,v 1.71 2009/01/07 14:35:39 patthoyts Exp $
#
# Copyright (c) 1994-1998 Sun Microsystems, Inc.
#
@@ -1815,7 +1815,7 @@ proc ::tk::dialog::file::ListInvoke {w filenames} {
if {$class eq "TkChooseDir" || [file isdirectory $file]} {
set appPWD [pwd]
if {[catch {cd $file}]} {
- tk_messageBox -type ok -parent $w -message -icon warning \
+ tk_messageBox -type ok -parent $w -icon warning -message \
[mc "Cannot change to the directory \"%1\$s\".\nPermission denied." $file]
} else {
cd $appPWD