summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--library/dialog.tcl10
-rw-r--r--library/tkfbox.tcl5
3 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 027d5fe..2efd6fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2001-08-08 Don Porter <dgp@users.sourceforge.net>
+ * tests/dialog.test: New file testing [tk_dialog].
+
+ * library/dialog.tcl:
+ * library/tkfbox.tcl: Corrections to problems introduced by
+ the TIP 44 changes. [Bug 449261]
+
* README:
* generic/tk.h:
* unix/configure:
diff --git a/library/dialog.tcl b/library/dialog.tcl
index a6f3c5b..26d643d 100644
--- a/library/dialog.tcl
+++ b/library/dialog.tcl
@@ -3,7 +3,7 @@
# This file defines the procedure tk_dialog, which creates a dialog
# box containing a bitmap, a message, and one or more buttons.
#
-# RCS: @(#) $Id: dialog.tcl,v 1.10 2001/08/06 18:29:41 dgp Exp $
+# RCS: @(#) $Id: dialog.tcl,v 1.11 2001/08/09 00:47:09 dgp Exp $
#
# Copyright (c) 1992-1993 The Regents of the University of California.
# Copyright (c) 1994-1997 Sun Microsystems, Inc.
@@ -104,7 +104,7 @@ proc ::tk_dialog {w title text bitmap default args} {
set i 0
foreach but $args {
- button $w.button$i -text $but -command [list set Priv(button) $i]
+ button $w.button$i -text $but -command [list set ::tk::Priv(button) $i]
if {$i == $default} {
$w.button$i configure -default active
} else {
@@ -130,7 +130,7 @@ proc ::tk_dialog {w title text bitmap default args} {
[list $w.button$default] configure -state active -relief sunken
update idletasks
after 100
- set Priv(button) $default
+ set ::tk::Priv(button) $default
"
}
@@ -138,7 +138,7 @@ proc ::tk_dialog {w title text bitmap default args} {
# button variable to -1; this is needed in case something happens
# that destroys the window, such as its parent window being destroyed.
- bind $w <Destroy> {set Priv(button) -1}
+ bind $w <Destroy> {set ::tk::Priv(button) -1}
# 6. Withdraw the window, then update all the geometry information
# so we know how big it wants to be, then center the window in the
@@ -178,7 +178,7 @@ proc ::tk_dialog {w title text bitmap default args} {
catch {
# It's possible that the window has already been destroyed,
# hence this "catch". Delete the Destroy handler so that
- # tk::Priv(button) doesn't get reset by it.
+ # Priv(button) doesn't get reset by it.
bind $w <Destroy> {}
destroy $w
diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl
index 194f2f4..4e2ed56 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.28 2001/08/01 21:11:41 dgp Exp $
+# RCS: @(#) $Id: tkfbox.tcl,v 1.29 2001/08/09 00:47:09 dgp Exp $
#
# Copyright (c) 1994-1998 Sun Microsystems, Inc.
#
@@ -700,7 +700,6 @@ proc ::tk::IconList_KeyPress {w key} {
proc ::tk::IconList_Goto {w text} {
upvar ::tk::$w data
upvar ::tk::$w:textList textList
- variable ::tk::Priv
if {![info exists data(list)]} {
return
@@ -857,7 +856,7 @@ proc ::tk::dialog::file:: {type args} {
# may take the focus away so we can't redirect it. Finally,
# restore any grab that was in effect.
- vwait tk::Priv(selectFilePath)
+ vwait ::tk::Priv(selectFilePath)
::tk::RestoreFocusGrab $w $data(ent) withdraw