diff options
| author | das <das> | 2006-09-11 14:41:16 (GMT) |
|---|---|---|
| committer | das <das> | 2006-09-11 14:41:16 (GMT) |
| commit | 1ed7988e57ed8aa8ca8d7905111f23c77dcbddcb (patch) | |
| tree | 191fbdfd83d2610a765417eb034ddb441109d985 /library | |
| parent | d454b5134819c8607ad53ecd86e15bb3424b4836 (diff) | |
| download | tk-1ed7988e57ed8aa8ca8d7905111f23c77dcbddcb.zip tk-1ed7988e57ed8aa8ca8d7905111f23c77dcbddcb.tar.gz tk-1ed7988e57ed8aa8ca8d7905111f23c77dcbddcb.tar.bz2 | |
* macosx/tkMacOSXWm.c (TkMacOSXMakeRealWindowExist): revert part of
2006-05-16 change that had set overrideredirect windows to not become
activated by the window manager, as this prevented interaction with
native widgets in such windows [Bug 1472624]; apply changes to carbon
window attributes even if native window has already been created.
* macosx/tkMacOSXKeyEvent.c (TkMacOSXProcessKeyboardEvent): fix app
* macosx/tkMacOSXMenu.c (DrawMenuBarWhenIdle): menu item key shortcuts
* macosx/tkMacOSXInt.h: when custom ".apple" menu is installed.
* library/demos/widget: on TkAqua, don't install file menu with single
quit menu item, as the application menu already has a quit item.
* macosx/tkMacOSXColor.c: fix building on Mac OS X 10.2.
Diffstat (limited to 'library')
| -rw-r--r-- | library/demos/widget | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/library/demos/widget b/library/demos/widget index 7795851..1e96c59 100644 --- a/library/demos/widget +++ b/library/demos/widget @@ -11,7 +11,7 @@ exec wish "$0" "$@" # ".tcl" files is this directory, which are sourced by this script # as needed. # -# RCS: @(#) $Id: widget,v 1.9.2.1 2003/09/25 05:37:48 das Exp $ +# RCS: @(#) $Id: widget,v 1.9.2.2 2006/09/11 14:41:16 das Exp $ eval destroy [winfo child .] wm title . "Widget Demonstration" @@ -43,24 +43,24 @@ set font $widgetFont(main) #---------------------------------------------------------------- menu .menuBar -tearoff 0 -.menuBar add cascade -menu .menuBar.file -label "File" -underline 0 -menu .menuBar.file -tearoff 0 -# On the Mac use the specia .apple menu for the about item +# On the Mac use the special .apple menu for the about item 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" } else { + .menuBar add cascade -menu .menuBar.file -label "File" -underline 0 + menu .menuBar.file -tearoff 0 .menuBar.file add command -label "About..." -command "aboutBox" \ -underline 0 -accelerator "<F1>" .menuBar.file add sep + .menuBar.file add command -label "Quit" -command "exit" -underline 0 \ + -accelerator "Meta-Q" + bind . <F1> aboutBox } -.menuBar.file add command -label "Quit" -command "exit" -underline 0 \ - -accelerator "Meta-Q" . configure -menu .menuBar -bind . <F1> aboutBox frame .statusBar label .statusBar.lab -text " " -relief sunken -bd 1 \ |