diff options
author | das <das> | 2003-09-25 05:37:48 (GMT) |
---|---|---|
committer | das <das> | 2003-09-25 05:37:48 (GMT) |
commit | 9a0aa47ac345a885549c42ece41c68c066c15d58 (patch) | |
tree | fe1f38675ef73180e8511ef9e452533ff2ddb556 /library | |
parent | b789bd9bde8fcc02d873ec79094b914aa2627fbc (diff) | |
download | tk-9a0aa47ac345a885549c42ece41c68c066c15d58.zip tk-9a0aa47ac345a885549c42ece41c68c066c15d58.tar.gz tk-9a0aa47ac345a885549c42ece41c68c066c15d58.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/widget | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/demos/widget b/library/demos/widget index 33c7843..7795851 100644 --- a/library/demos/widget +++ b/library/demos/widget @@ -11,11 +11,11 @@ exec wish "$0" "$@" # ".tcl" files is this directory, which are sourced by this script # as needed. # -# RCS: @(#) $Id: widget,v 1.9 2003/02/19 16:13:15 dkf Exp $ +# RCS: @(#) $Id: widget,v 1.9.2.1 2003/09/25 05:37:48 das Exp $ eval destroy [winfo child .] wm title . "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 \ @@ -47,7 +47,7 @@ menu .menuBar -tearoff 0 menu .menuBar.file -tearoff 0 # On the Mac use the specia .apple menu for the about item -if {[string equal [tk windowingsystem] "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 "About..." -command "aboutBox" |