summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--library/comdlg.tcl11
2 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ba5f332..cae2af2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-04 Don Porter <dgp@users.sourceforge.net>
+
+ * library/comdlg.tcl: Added Macintosh file type validation to
+ [::tk::FDGetFileTypes]. [Bug 1083878] (Thanks, Vince Darley)
+
2005-04-04 Vince Darley <vincentdarley@users.sourceforge.net>
* generic/tkText.c:
diff --git a/library/comdlg.tcl b/library/comdlg.tcl
index 9cc5d74..5192791 100644
--- a/library/comdlg.tcl
+++ b/library/comdlg.tcl
@@ -3,7 +3,7 @@
# Some functions needed for the common dialog boxes. Probably need to go
# in a different file.
#
-# RCS: @(#) $Id: comdlg.tcl,v 1.9 2003/02/21 13:32:14 dkf Exp $
+# RCS: @(#) $Id: comdlg.tcl,v 1.10 2005/04/05 13:56:35 dgp Exp $
#
# Copyright (c) 1996 Sun Microsystems, Inc.
#
@@ -279,6 +279,15 @@ proc ::tk::FDGetFileTypes {string} {
continue
}
+ # Validate each macType. This is to agree with the
+ # behaviour of TkGetFileFilters(). This list may be
+ # empty.
+ foreach macType [lindex $t 2] {
+ if {[string length $macType] != 4} {
+ error "bad Macintosh file type \"$macType\""
+ }
+ }
+
set name "$label ("
set sep ""
set doAppend 1