summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpspjuth <peter.spjuth@gmail.com>2004-01-25 01:28:55 (GMT)
committerpspjuth <peter.spjuth@gmail.com>2004-01-25 01:28:55 (GMT)
commit00be7f8944ba29e824b103b00b0748b842ac8c2e (patch)
treeaaafa983e0dac06bd7695eea93c28b05bc07f5a2
parent9d2ef7a46c28f65d45756cfb6d68dd742cf011b3 (diff)
downloadtk-00be7f8944ba29e824b103b00b0748b842ac8c2e.zip
tk-00be7f8944ba29e824b103b00b0748b842ac8c2e.tar.gz
tk-00be7f8944ba29e824b103b00b0748b842ac8c2e.tar.bz2
The dialogs were affected by the TIP#146 implementation.
Added grid anchor commands to restore original behaviour.
-rw-r--r--ChangeLog6
-rw-r--r--library/dialog.tcl11
-rw-r--r--library/msgbox.tcl3
3 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 0086610..87adc3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-25 Peter Spjuth <peter.spjuth@space.se>
+ * library/dialog.tcl:
+ * library/msgbox.tcl: The dialogs were affected by the TIP#146
+ implementation. Added grid anchor commands to restore original
+ behaviour.
+
2004-01-15 David Gravereaux <davygrvy@pobox.com>
* win/tkWinSendCom.c: Placed the requirement for the special COM
diff --git a/library/dialog.tcl b/library/dialog.tcl
index 398a494..e51e7a1 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.15 2003/10/22 15:24:24 dkf Exp $
+# RCS: @(#) $Id: dialog.tcl,v 1.16 2004/01/25 01:29:15 pspjuth Exp $
#
# Copyright (c) 1992-1993 The Regents of the University of California.
# Copyright (c) 1994-1997 Sun Microsystems, Inc.
@@ -78,6 +78,7 @@ proc ::tk_dialog {w title text bitmap default args} {
}
pack $w.bot -side bottom -fill both
pack $w.top -side top -fill both -expand 1
+ grid anchor $w.bot center
# 2. Fill the top part with bitmap and message (use the option
# database for -wraplength and -font so that they can be
@@ -165,7 +166,7 @@ proc ::tk_dialog {w title text bitmap default args} {
set y 0
}
wm maxsize $w [winfo screenwidth $w] [winfo screenheight $w]
- wm geom $w +$x+$y
+ wm geometry $w +$x+$y
wm deiconify $w
# 7. Set a grab and claim the focus too.
@@ -199,10 +200,10 @@ proc ::tk_dialog {w title text bitmap default args} {
destroy $w
}
if {[string compare $oldGrab ""]} {
- if {[string compare $grabStatus "global"]} {
+ if {[string compare $grabStatus "global"]} {
grab $oldGrab
- } else {
- grab -global $oldGrab
+ } else {
+ grab -global $oldGrab
}
}
return $Priv(button)
diff --git a/library/msgbox.tcl b/library/msgbox.tcl
index a9d895e..4f9badf 100644
--- a/library/msgbox.tcl
+++ b/library/msgbox.tcl
@@ -3,7 +3,7 @@
# Implements messageboxes for platforms that do not have native
# messagebox support.
#
-# RCS: @(#) $Id: msgbox.tcl,v 1.25 2003/03/12 16:01:02 dkf Exp $
+# RCS: @(#) $Id: msgbox.tcl,v 1.26 2004/01/25 01:29:15 pspjuth Exp $
#
# Copyright (c) 1994-1997 Sun Microsystems, Inc.
#
@@ -262,6 +262,7 @@ proc ::tk::MessageBox {args} {
}
frame $w.bot -background $bg
+ grid anchor $w.bot center
pack $w.bot -side bottom -fill both
frame $w.top -background $bg
pack $w.top -side top -fill both -expand 1