summaryrefslogtreecommitdiffstats
path: root/library/demos
diff options
context:
space:
mode:
authordas <das>2006-09-11 14:41:03 (GMT)
committerdas <das>2006-09-11 14:41:03 (GMT)
commit165a8b48f80b1a778723600317777204d52a5186 (patch)
tree700c7d9af3cce6f0a022e29d853e43c8b0b799ab /library/demos
parent41dfe0d4791ea37a1f6a7c3b069b3f41c79466b0 (diff)
downloadtk-165a8b48f80b1a778723600317777204d52a5186.zip
tk-165a8b48f80b1a778723600317777204d52a5186.tar.gz
tk-165a8b48f80b1a778723600317777204d52a5186.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/demos')
-rw-r--r--library/demos/widget19
1 files changed, 10 insertions, 9 deletions
diff --git a/library/demos/widget b/library/demos/widget
index 8a180df..ec964f9 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.27 2004/11/08 21:57:53 dkf Exp $
+# RCS: @(#) $Id: widget,v 1.28 2006/09/11 14:41:04 das Exp $
package require Tcl 8.5
package require Tk 8.5
@@ -99,26 +99,27 @@ image create photo ::img::print -height 19 -format GIF -data {
#----------------------------------------------------------------
menu .menuBar -tearoff 0
-# This is a tk-internal procedure to make i18n easier
-::tk::AmpMenuArgs .menuBar add cascade -label [mc "&File"] -menu .menuBar.file
-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 "aqua"} {
.menuBar add cascade -menu .menuBar.apple
menu .menuBar.apple -tearoff 0
.menuBar.apple add command -label [mc "About..."] -command {aboutBox}
} else {
+ # This is a tk-internal procedure to make i18n easier
+ ::tk::AmpMenuArgs .menuBar add cascade -label [mc "&File"] \
+ -menu .menuBar.file
+ menu .menuBar.file -tearoff 0
::tk::AmpMenuArgs .menuBar.file add command -label [mc "&About..."] \
-command {aboutBox} -accelerator [mc "<F1>"]
.menuBar.file add sep
+ ::tk::AmpMenuArgs .menuBar.file add command -label [mc "&Quit"] \
+ -command {exit} -accelerator [mc "Meta-Q"]
+ bind . <[mc "Meta-q"]> {exit}
+ bind . <F1> {aboutBox}
}
-::tk::AmpMenuArgs .menuBar.file add command -label [mc "&Quit"] \
- -command {exit} -accelerator [mc "Meta-Q"]
. configure -menu .menuBar
-bind . <F1> {aboutBox}
-bind . <[mc "Meta-q"]> {exit}
frame .statusBar
label .statusBar.lab -text " " -relief sunken -bd 1 \