diff options
| author | hobbs <hobbs> | 2008-01-31 23:33:42 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2008-01-31 23:33:42 (GMT) |
| commit | df8e32d03c1f651934a9ba8d02e13faef8fe6dc6 (patch) | |
| tree | bdea2cb576daa076068b1425ee500c688007cfb6 | |
| parent | 763a2af63e3be0052e1a7077bfd29d0942f3c1eb (diff) | |
| download | tk-df8e32d03c1f651934a9ba8d02e13faef8fe6dc6.zip tk-df8e32d03c1f651934a9ba8d02e13faef8fe6dc6.tar.gz tk-df8e32d03c1f651934a9ba8d02e13faef8fe6dc6.tar.bz2 | |
* library/msgbox.tcl (::tk::MessageBox): don't use ttk::label in
low depth/aqua fallback, as it doesn't support -bitmap.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | library/msgbox.tcl | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -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 |