summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authordas <das>2003-09-25 05:36:59 (GMT)
committerdas <das>2003-09-25 05:36:59 (GMT)
commit70b0eceea88a9726074d5fd6be8d70453c7c5717 (patch)
tree942ddd8b847078442e681b156b1e5b5d4cb92b8a /library
parent9602bb473587aa0e5974dc784fe2f50cad24b8e9 (diff)
downloadtk-70b0eceea88a9726074d5fd6be8d70453c7c5717.zip
tk-70b0eceea88a9726074d5fd6be8d70453c7c5717.tar.gz
tk-70b0eceea88a9726074d5fd6be8d70453c7c5717.tar.bz2
* library/demos/widget: don't create iconwindow on aqua, but add
about menu like on classic. * macosx/Makefile: pass MAKEOVERRIDES to pxbuild. * macosx/tkMacOSXButton.c: added -compound support for bevel buttons.
Diffstat (limited to 'library')
-rw-r--r--library/demos/widget6
1 files changed, 3 insertions, 3 deletions
diff --git a/library/demos/widget b/library/demos/widget
index f0ad7a7..ae32937 100644
--- a/library/demos/widget
+++ b/library/demos/widget
@@ -11,14 +11,14 @@ exec wish "$0" "$@"
# ".tcl" files is this directory, which are sourced by this script
# as needed.
#
-# RCS: @(#) $Id: widget,v 1.15 2003/08/22 22:44:15 dkf Exp $
+# RCS: @(#) $Id: widget,v 1.16 2003/09/25 05:37:00 das Exp $
eval destroy [winfo child .]
package require msgcat
::msgcat::mcload [file join $tk_library demos]
namespace import ::msgcat::mc
wm title . [mc "Widget Demonstration"]
-if {$tcl_platform(platform) eq "unix"} {
+if {[tk windowingsystem] eq "x11"} {
# This won't work everywhere, but there's no other way in core Tk
# at the moment to display a coloured icon.
image create photo TclPowered \
@@ -72,7 +72,7 @@ menu .menuBar -tearoff 0
menu .menuBar.file -tearoff 0
# On the Mac use the specia .apple menu for the about item
-if {[tk windowingsystem] eq "classic"} {
+if {[tk windowingsystem] eq "classic" || [tk windowingsystem] eq "aqua"} {
.menuBar add cascade -menu .menuBar.apple
menu .menuBar.apple -tearoff 0
.menuBar.apple add command -label [mc "About..."] -command {aboutBox}