summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorericm <ericm>2000-03-29 00:09:05 (GMT)
committerericm <ericm>2000-03-29 00:09:05 (GMT)
commit1e80b03098719125228a0114b3b1a0cd8e1e00c3 (patch)
tree6c3d1ba08edc50ecc28706589d03d3d2708fbe90 /library
parent1572ee84e8f99582332894571332dbc6d4f06855 (diff)
downloadtk-1e80b03098719125228a0114b3b1a0cd8e1e00c3.zip
tk-1e80b03098719125228a0114b3b1a0cd8e1e00c3.tar.gz
tk-1e80b03098719125228a0114b3b1a0cd8e1e00c3.tar.bz2
* library/tkfbox.tcl: Moved an overlooked tkFDialog* function inscriptics_sc_2_0_fixedscriptics_sc_2_0_b5
::tk::dialog::file namespace. * tests/unixWm.test: Added tests for memory leak conditions in tkUnixWm.c. * tests/canvas.test: Added test for bad configuration options on empty and non-empty canvas. * generic/tkCanvas.c: Removed bad code in CANV_CONFIGURE block of CanvasWidgetCmd; this was causing non-empty canvases to improperly handle bad configuration options [Bug: 4456].
Diffstat (limited to 'library')
-rw-r--r--library/tkfbox.tcl10
1 files changed, 5 insertions, 5 deletions
diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl
index 0495192..6090288 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.16 2000/03/24 19:38:57 ericm Exp $
+# RCS: @(#) $Id: tkfbox.tcl,v 1.17 2000/03/29 00:09:06 ericm Exp $
#
# Copyright (c) 1994-1998 Sun Microsystems, Inc.
#
@@ -623,7 +623,7 @@ proc tkIconList_Reset {w} {
namespace eval ::tk::dialog {}
namespace eval ::tk::dialog::file {}
-# tkFDialog --
+# ::tk::dialog::file::tkFDialog --
#
# Implements the TK file selection dialog. This dialog is used when
# the tk_strictMotif flag is set to false. This procedure shouldn't
@@ -1155,7 +1155,7 @@ proc ::tk::dialog::file::SetFilter {w type} {
::tk::dialog::file::UpdateWhenIdle $w
}
-# tkFDialogResolveFile --
+# tk::dialog::file::ResolveFile --
#
# Interpret the user's text input in a file selection dialog.
# Performs:
@@ -1187,7 +1187,7 @@ proc ::tk::dialog::file::SetFilter {w type} {
# directory may not be the same as context, because text may contain
# a subdirectory name
#
-proc tkFDialogResolveFile {context text defaultext} {
+proc ::tk::dialog::file::ResolveFile {context text defaultext} {
set appPWD [pwd]
@@ -1292,7 +1292,7 @@ proc ::tk::dialog::file::ActivateEnt {w} {
upvar ::tk::dialog::file::[winfo name $w] data
set text [string trim [$data(ent) get]]
- set list [tkFDialogResolveFile $data(selectPath) $text \
+ set list [::tk::dialog::file::ResolveFile $data(selectPath) $text \
$data(-defaultextension)]
set flag [lindex $list 0]
set path [lindex $list 1]