diff options
author | dgp@users.sourceforge.net <dgp> | 2006-01-25 18:22:04 (GMT) |
---|---|---|
committer | dgp@users.sourceforge.net <dgp> | 2006-01-25 18:22:04 (GMT) |
commit | 4623ca7925681b1e0d38eedeb46e08950ecc5c2a (patch) | |
tree | 80bb0c008e169df663722d227f5f24bc18665bac /library/bgerror.tcl | |
parent | bcad625478b8c40ea5c042d8b956efdcb31e1f3f (diff) | |
download | tk-4623ca7925681b1e0d38eedeb46e08950ecc5c2a.zip tk-4623ca7925681b1e0d38eedeb46e08950ecc5c2a.tar.gz tk-4623ca7925681b1e0d38eedeb46e08950ecc5c2a.tar.bz2 |
* library/bgerror.tcl: Updates to use Tcl 8.4 features. [Patch 1237759] * library/choosedir.tcl:
* library/comdlg.tcl:
* library/console.tcl:
* library/dialog.tcl:
* library/focus.tcl:
* library/msgbox.tcl:
* library/palette.tcl:
* library/tk.tcl:
* library/tkfbox.tcl:
* library/xmfbox.tcl:
Diffstat (limited to 'library/bgerror.tcl')
-rw-r--r-- | library/bgerror.tcl | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/library/bgerror.tcl b/library/bgerror.tcl index a1837a2..05569c1 100644 --- a/library/bgerror.tcl +++ b/library/bgerror.tcl @@ -9,8 +9,8 @@ # Copyright (c) 1998-2000 by Ajuba Solutions. # All rights reserved. # -# RCS: @(#) $Id: bgerror.tcl,v 1.29 2005/11/15 03:12:18 jenglish Exp $ -# $Id: bgerror.tcl,v 1.29 2005/11/15 03:12:18 jenglish Exp $ +# RCS: @(#) $Id: bgerror.tcl,v 1.30 2006/01/25 18:22:04 dgp Exp $ +# $Id: bgerror.tcl,v 1.30 2006/01/25 18:22:04 dgp Exp $ namespace eval ::tk::dialog::error { namespace import -force ::tk::msgcat::* @@ -88,7 +88,8 @@ proc ::tk::dialog::error::bgerror err { # Ok the application's tkerror either failed or was not found # we use the default dialog then : - if {[tk windowingsystem] eq "aqua"} { + set windowingsystem [tk windowingsystem] + if {$windowingsystem eq "aqua"} { set ok [mc Ok] set messageFont system set textRelief flat @@ -130,20 +131,20 @@ proc ::tk::dialog::error::bgerror err { # 1. Create the top-level window and divide it into top # and bottom parts. - catch {destroy .bgerrorDialog} + destroy .bgerrorDialog toplevel .bgerrorDialog -class ErrorDialog wm withdraw .bgerrorDialog wm title .bgerrorDialog $title wm iconname .bgerrorDialog ErrorDialog wm protocol .bgerrorDialog WM_DELETE_WINDOW { } - if {[tk windowingsystem] eq "aqua"} { + if {$windowingsystem eq "aqua"} { ::tk::unsupported::MacWindowStyle style .bgerrorDialog zoomDocProc } frame .bgerrorDialog.bot frame .bgerrorDialog.top - if {[tk windowingsystem] eq "x11"} { + if {$windowingsystem eq "x11"} { .bgerrorDialog.bot configure -relief raised -bd 1 .bgerrorDialog.top configure -relief raised -bd 1 } @@ -179,7 +180,7 @@ proc ::tk::dialog::error::bgerror err { set wrapwidth [expr {$wrapwidth-60-[winfo pixels .bgerrorDialog 9m]}] label .bgerrorDialog.msg -justify left -text $text -font $messageFont \ -wraplength $wrapwidth - if {[tk windowingsystem] eq "aqua"} { + if {$windowingsystem eq "aqua"} { # On the Macintosh, use the stop bitmap label .bgerrorDialog.bitmap -bitmap stop } else { @@ -214,7 +215,7 @@ proc ::tk::dialog::error::bgerror err { -padx 10 grid columnconfigure .bgerrorDialog.bot $i -weight 1 # We boost the size of some Mac buttons for l&f - if {[tk windowingsystem] eq "aqua"} { + if {$windowingsystem eq "aqua"} { if {($name eq "ok") || ($name eq "dismiss")} { grid columnconfigure .bgerrorDialog.bot $i -minsize 79 } |