summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--doc/ConfigWidg.37
-rw-r--r--unix/mkLinks4
3 files changed, 6 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index efedbba..efc9e8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
2003-10-06 Don Porter <dgp@users.sourceforge.net>
+ * doc/ConfigWidg.3: Removed reference to Tk_Offset from the
+ NAME section to resolve mkLinks conflict with SetOptions.3 [Bug 404197]
+
* unix/configure.in: Reconfigured to use $TCL_PREFIX as the
default value of --prefix, and also added warning when a TK_PREFIX
value different from TCL_PREFIX is selected, since [package require Tk]
@@ -29,6 +32,7 @@
verify that's what we have. [Bug 749088]
* unix/configure: autoconf (2.57)
+ * unix/mkLinks: make mklinks
2003-10-03 Pat Thoyts <patthoyts@users.sourceforge.net>
diff --git a/doc/ConfigWidg.3 b/doc/ConfigWidg.3
index 87ab6e9..51c2f7e 100644
--- a/doc/ConfigWidg.3
+++ b/doc/ConfigWidg.3
@@ -5,13 +5,13 @@
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
'\"
-'\" RCS: @(#) $Id: ConfigWidg.3,v 1.8 2002/08/05 04:30:38 dgp Exp $
+'\" RCS: @(#) $Id: ConfigWidg.3,v 1.9 2003/10/06 22:20:22 dgp Exp $
'\"
.so man.macros
.TH Tk_ConfigureWidget 3 4.1 Tk "Tk Library Procedures"
.BS
.SH NAME
-Tk_ConfigureWidget, Tk_Offset, Tk_ConfigureInfo, Tk_ConfigureValue, Tk_FreeOptions \- process configuration options for widgets
+Tk_ConfigureWidget, Tk_ConfigureInfo, Tk_ConfigureValue, Tk_FreeOptions \- process configuration options for widgets
.SH SYNOPSIS
.nf
\fB#include <tk.h>\fR
@@ -20,9 +20,6 @@ int
\fBTk_ConfigureWidget(\fIinterp, tkwin, specs, argc, argv, widgRec, flags\fB)\fR
.sp
int
-\fBTk_Offset(\fItype, field\fB)\fR
-.sp
-int
\fBTk_ConfigureInfo(\fIinterp, tkwin, specs, widgRec, argvName, flags\fB)\fR
.sp
int
diff --git a/unix/mkLinks b/unix/mkLinks
index d58b06c..0b91246 100644
--- a/unix/mkLinks
+++ b/unix/mkLinks
@@ -15,8 +15,6 @@
# The script takes one argument, which is the name of the directory
# where the manual entries have been installed.
-S=""
-
ZIP=true
while true; do
case $1 in
@@ -176,12 +174,10 @@ if test -r ConfigWidg.3; then
rm -f ConfigWidg.3.*
$ZIP ConfigWidg.3
rm -f Tk_ConfigureWidget.3 Tk_ConfigureWidget.3.*
- rm -f Tk_Offset.3 Tk_Offset.3.*
rm -f Tk_ConfigureInfo.3 Tk_ConfigureInfo.3.*
rm -f Tk_ConfigureValue.3 Tk_ConfigureValue.3.*
rm -f Tk_FreeOptions.3 Tk_FreeOptions.3.*
ln $S ConfigWidg.3$Z Tk_ConfigureWidget.3$Z
- ln $S ConfigWidg.3$Z Tk_Offset.3$Z
ln $S ConfigWidg.3$Z Tk_ConfigureInfo.3$Z
ln $S ConfigWidg.3$Z Tk_ConfigureValue.3$Z
ln $S ConfigWidg.3$Z Tk_FreeOptions.3$Z