summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs@noemail.net>1999-08-13 02:58:11 (GMT)
committerhobbs <hobbs@noemail.net>1999-08-13 02:58:11 (GMT)
commitc9bf89017c5dc48cb66dce039ceca20973b84288 (patch)
treee460cfa407204b8e324bb24f0d527361e8241f13
parentd84acaf615e1b0eb6cf9bd12b6e4bf04c5df3a93 (diff)
downloadtk-c9bf89017c5dc48cb66dce039ceca20973b84288.zip
tk-c9bf89017c5dc48cb66dce039ceca20973b84288.tar.gz
tk-c9bf89017c5dc48cb66dce039ceca20973b84288.tar.bz2
*** empty log message ***
FossilOrigin-Name: 7739d4e17fdc07813bb7f38e05999627a914f9dc
-rw-r--r--doc/options.n6
-rw-r--r--library/tk.tcl12
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/options.n b/doc/options.n
index af406da..fca76e3 100644
--- a/doc/options.n
+++ b/doc/options.n
@@ -5,7 +5,7 @@
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
'\"
-'\" RCS: @(#) $Id: options.n,v 1.3 1999/08/09 16:51:51 hobbs Exp $
+'\" RCS: @(#) $Id: options.n,v 1.4 1999/08/13 02:58:12 hobbs Exp $
'\"
.so man.macros
.TH options n 4.4 Tk "Tk Built-In Commands"
@@ -278,8 +278,8 @@ particular widget and may be determined by other options, such as
\fBanchor\fR or \fBjustify\fR.
.OP \-troughcolor troughColor Background
Specifies the color to use for the rectangular trough areas
-in widgets such as scrollbars and scales. This option is ignored
-on Windows (native widget doesn't recognize this option).
+in widgets such as scrollbars and scales. This option is ignored for
+scrollbars on Windows (native widget doesn't recognize this option).
.OP \-underline underline Underline
Specifies the integer index of a character to underline in the widget.
This option is used by the default bindings to implement keyboard
diff --git a/library/tk.tcl b/library/tk.tcl
index 90e9f66..ae68609 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.9 1999/08/10 15:27:49 hobbs Exp $
+# RCS: @(#) $Id: tk.tcl,v 1.10 1999/08/13 02:58:17 hobbs Exp $
#
# Copyright (c) 1992-1994 The Regents of the University of California.
# Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -20,10 +20,9 @@ package require -exact Tcl 8.2
# Add Tk's directory to the end of the auto-load search path, if it
# isn't already on the path:
-if {[info exists auto_path]} {
- if {[lsearch -exact $auto_path $tk_library] < 0} {
- lappend auto_path $tk_library
- }
+if {[info exists auto_path] && [string compare {} $tk_library] && \
+ [lsearch -exact $auto_path $tk_library] < 0} {
+ lappend auto_path $tk_library
}
# Turn off strict Motif look and feel as a default.
@@ -181,7 +180,8 @@ switch $tcl_platform(platform) {
# Read in files that define all of the class bindings.
# ----------------------------------------------------------------------
-if {[string compare $tcl_platform(platform) "macintosh"]} {
+if {[string compare $tcl_platform(platform) "macintosh"] &&
+ [string compare {} $tk_library]} {
source [file join $tk_library button.tcl]
source [file join $tk_library entry.tcl]
source [file join $tk_library listbox.tcl]