summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2009-04-13 21:26:36 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2009-04-13 21:26:36 (GMT)
commit2bec2a4b962e25529e86cf4340ca12e807a0c44d (patch)
tree2961a234afa76ccf1597f39e64586970e7f4ef5f
parent28d98c9e16e4438912e49cc0cb4370b3220a47fa (diff)
downloadtk-2bec2a4b962e25529e86cf4340ca12e807a0c44d.zip
tk-2bec2a4b962e25529e86cf4340ca12e807a0c44d.tar.gz
tk-2bec2a4b962e25529e86cf4340ca12e807a0c44d.tar.bz2
Fix the other issue from [Bug 2759119].
-rw-r--r--ChangeLog4
-rw-r--r--library/tk.tcl4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 753e180..5fcb335 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2009-04-13 Donal K. Fellows <dkf@users.sf.net>
+ * library/tk.tcl: Corrected another problem; can't determine the exact
+ type of OS - needed for figuring out how to guess the correct binding
+ in some circumstances - in a safe interpreter.
+
* library/tkfbox.tcl: [Bug 2759119]: Corrected level handling for the
* library/xmfbox.tcl: -typevariable option following updates to tk.tcl
[Patch 2739360]: Use more modern images from Tango set for the non-
diff --git a/library/tk.tcl b/library/tk.tcl
index ac813d1..7f7926a 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -3,7 +3,7 @@
# Initialization script normally executed in the interpreter for each
# Tk-based application. Arranges class bindings for widgets.
#
-# RCS: @(#) $Id: tk.tcl,v 1.85 2009/04/11 12:49:49 dkf Exp $
+# RCS: @(#) $Id: tk.tcl,v 1.86 2009/04/13 21:26:36 dkf Exp $
#
# Copyright (c) 1992-1994 The Regents of the University of California.
# Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -369,7 +369,7 @@ switch -exact -- [tk windowingsystem] {
event add <<Undo>> <Control-Key-z> <Control-Lock-Key-Z>
event add <<Redo>> <Control-Key-Z> <Control-Lock-Key-z>
event add <<ContextMenu>> <Button-3>
- if {$tcl_platform(os) eq "Darwin"} {
+ if {[info exists tcl_platform(os)] && $tcl_platform(os) eq "Darwin"} {
event add <<ContextMenu>> <Button-2>
}