summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--library/safetk.tcl7
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a9e318..83b408b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-05 Jeff Hobbs <hobbs@scriptics.com>
+
+ * library/safetk.tcl: rationalized the setting of tk_library when
+ initialized Tk in a safe interpreter.
+
2000-08-03 Eric Melski <ericm@ajubasolutions.com>
* generic/tkWindow.c: Updated "grab" command entry to use
diff --git a/library/safetk.tcl b/library/safetk.tcl
index b2e0c02..3b01a78 100644
--- a/library/safetk.tcl
+++ b/library/safetk.tcl
@@ -2,7 +2,7 @@
#
# Support procs to use Tk in safe interpreters.
#
-# RCS: @(#) $Id: safetk.tcl,v 1.6 2000/04/08 06:59:28 hobbs Exp $
+# RCS: @(#) $Id: safetk.tcl,v 1.7 2000/08/06 00:11:18 hobbs Exp $
#
# Copyright (c) 1997 Sun Microsystems, Inc.
#
@@ -37,6 +37,11 @@ namespace eval ::safe {
proc ::safe::tkInterpInit {slave argv} {
global env tk_library
+ # We have to make sure that the tk_library variable uses a file
+ # pathname that works better in Tk (of the style returned by
+ # [file join], ie C:/path/to/tk/lib, not C:\path\to\tk\lib
+ set tk_library [eval [list file join] [file split $tk_library]]
+
# Clear Tk's access for that interp (path).
allowTk $slave $argv