diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-10 14:47:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-10 14:47:24 (GMT) |
| commit | c8f0062c64f9fc019a92e9bbc8918aa3e4ba1571 (patch) | |
| tree | a2856b5cd593cfd80fcf0b20a8de5530d052e66f /library/bgerror.tcl | |
| parent | b9eb35ddebc45ca5424bb3c24d03c3585ba6030f (diff) | |
| download | tk-c8f0062c64f9fc019a92e9bbc8918aa3e4ba1571.zip tk-c8f0062c64f9fc019a92e9bbc8918aa3e4ba1571.tar.gz tk-c8f0062c64f9fc019a92e9bbc8918aa3e4ba1571.tar.bz2 | |
[Bug 3534137]: $tcl_platform(platform) != [tk windowingsystem]
Diffstat (limited to 'library/bgerror.tcl')
| -rw-r--r-- | library/bgerror.tcl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/library/bgerror.tcl b/library/bgerror.tcl index 06c72a1..3372115 100644 --- a/library/bgerror.tcl +++ b/library/bgerror.tcl @@ -94,7 +94,7 @@ proc ::tk::dialog::error::bgerror err { # we use the default dialog then : set windowingsystem [tk windowingsystem] - if {($tcl_platform(platform) eq "macintosh") + if {($windowingsystem eq "classic") || ($windowingsystem eq "aqua")} { set ok [mc Ok] set messageFont system @@ -143,7 +143,7 @@ proc ::tk::dialog::error::bgerror err { wm iconname .bgerrorDialog ErrorDialog wm protocol .bgerrorDialog WM_DELETE_WINDOW { } - if {($tcl_platform(platform) eq "macintosh") + if {($windowingsystem eq "classic") || ($windowingsystem eq "aqua")} { ::tk::unsupported::MacWindowStyle style .bgerrorDialog moveableAlert {} } elseif {$windowingsystem eq "x11"} { @@ -190,7 +190,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 {($tcl_platform(platform) eq "macintosh") + if {($windowingsystem eq "classic") || ($windowingsystem eq "aqua")} { # On the Macintosh, use the stop bitmap label .bgerrorDialog.bitmap -bitmap stop @@ -226,7 +226,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 {($tcl_platform(platform) eq "macintosh") + if {($windowingsystem eq "classic") || ($windowingsystem eq "aqua")} { if {($name eq "ok") || ($name eq "dismiss")} { grid columnconfigure .bgerrorDialog.bot $i -minsize 90 @@ -251,7 +251,7 @@ proc ::tk::dialog::error::bgerror err { # 7. Ensure that we are topmost. raise .bgerrorDialog - if {$tcl_platform(platform) eq "windows"} { + if {[tk windowingsystem] eq "win32"} { # Place it topmost if we aren't at the top of the stacking # order to ensure that it's seen if {[lindex [wm stackorder .] end] ne ".bgerrorDialog"} { |