summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--library/msgbox.tcl8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 89b006d..a5a50f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-24 Donal K. Fellows <dkf@users.sf.net>
+
+ * library/msgbox.tcl (::tk::MessageBox): Correct bindings so that they
+ work with ttk::buttons. Reported by Hans-Christoph Steiner.
+
2009-08-24 Daniel Steffen <das@users.sourceforge.net>
* generic/tkInt.h: Annotate Tcl_Panic as noreturn for clang static
diff --git a/library/msgbox.tcl b/library/msgbox.tcl
index a518308..41e3960 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.38 2009/01/11 11:51:39 patthoyts Exp $
+# RCS: @(#) $Id: msgbox.tcl,v 1.39 2009/08/24 21:22:46 dkf Exp $
#
# Copyright (c) 1994-1997 Sun Microsystems, Inc.
#
@@ -368,12 +368,12 @@ proc ::tk::MessageBox {args} {
if {$data(-default) ne ""} {
bind $w <FocusIn> {
- if {[winfo class %W] eq "Button"} {
+ if {[winfo class %W] in "Button TButton"} {
%W configure -default active
}
}
bind $w <FocusOut> {
- if {[winfo class %W] eq "Button"} {
+ if {[winfo class %W] in "Button TButton"} {
%W configure -default normal
}
}
@@ -382,7 +382,7 @@ proc ::tk::MessageBox {args} {
# 6. Create bindings for <Return>, <Escape> and <Destroy> on the dialog
bind $w <Return> {
- if {[winfo class %W] eq "Button"} {
+ if {[winfo class %W] in "Button TButton"} {
%W invoke
}
}