summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--library/msgbox.tcl5
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ed24377..91ebf85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2008-01-31 Jeff Hobbs <jeffh@ActiveState.com>
+ * library/msgbox.tcl (::tk::MessageBox): don't use ttk::label in
+ low depth/aqua fallback, as it doesn't support -bitmap.
+
* win/tkWinDialog.c (Tk_MessageBoxObjCmd): pass "" instead of NULL
when -title isn't set. [Bug #1881892]
diff --git a/library/msgbox.tcl b/library/msgbox.tcl
index 98fcc91..04d26a7 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.35 2007/12/13 15:26:27 dgp Exp $
+# RCS: @(#) $Id: msgbox.tcl,v 1.36 2008/01/31 23:33:42 hobbs Exp $
#
# Copyright (c) 1994-1997 Sun Microsystems, Inc.
#
@@ -301,7 +301,8 @@ proc ::tk::MessageBox {args} {
if {$data(-icon) ne ""} {
if {$windowingsystem eq "aqua"
|| ([winfo depth $w] < 4) || $tk_strictMotif} {
- ttk::label $w.bitmap -bitmap $data(-icon) -background $bg
+ # ttk::label has no -bitmap option
+ label $w.bitmap -bitmap $data(-icon) -background $bg
} else {
canvas $w.bitmap -width 32 -height 32 -highlightthickness 0 \
-background $bg