summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--library/msgbox.tcl6
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 549e3bc..81cdb4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-13 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * library/msgbox.tcl: [Patch #3154705] Close button has no effect
+
2011-01-06 Stuart Cassoff <stwo@users.sourceforge.net>
* generic/tkEvent.c: Cast some NULLs to (void *) in order to quash
diff --git a/library/msgbox.tcl b/library/msgbox.tcl
index 60b733f..e117b47 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.36.2.3 2010/01/20 23:43:51 patthoyts Exp $
+# RCS: @(#) $Id: msgbox.tcl,v 1.36.2.4 2011/01/13 07:48:31 nijtmans Exp $
#
# Copyright (c) 1994-1997 Sun Microsystems, Inc.
#
@@ -11,8 +11,6 @@
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-package require Ttk
-
# Ensure existence of ::tk::dialog namespace
#
namespace eval ::tk::dialog {}
@@ -256,7 +254,7 @@ proc ::tk::MessageBox {args} {
toplevel $w -class Dialog -bg $bg
wm title $w $data(-title)
wm iconname $w Dialog
- wm protocol $w WM_DELETE_WINDOW { }
+ wm protocol $w WM_DELETE_WINDOW [list $w.$cancel invoke]
# Message boxes should be transient with respect to their parent so that
# they always stay on top of the parent window. But some window managers