added TK_DONT_DESTROY_WINDOW flag to check in RaiseWinWhenIdle to

prevent timing sensitive crash

9 files changed, 708 insertions, 455 deletions

diff --git a/ChangeLog b/ChangeLog
index 15a63e1..99adf75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,21 +1,3 @@
-2000-04-27  Eric Melski  <ericm@scriptics.com>
-
-	* doc/Tk_Init.3: Added Tk_SafeInit information [Bug: 1884].
-
-	* doc/keysyms.n: Man page enumerating keysyms [RFE: 1645].
-
-	* doc/colors.n: Man page enumerating valid color names [RFE: 1645].
-
-	* doc/cursors.n: Man page enumerating valid cursor values [RFE: 1645].
-
-	* library/msgbox.tcl: Corrected Unix tk_messageBox implementation
-	to make the first button the default when no default is specified
-	[Bug: 2218].
-
-	* doc/messageBox.n: Updated documentation with regards to
-	selection of default button when none is specified (now it will
-	use the first button as the default in that case) [Bug: 2218].
-
 2000-04-26  Jeff Hobbs  <hobbs@scriptics.com>
 
 	8.3.1 RELEASE
diff --git a/doc/Tk_Init.3 b/doc/Tk_Init.3
index 779a9e6..badcbe4 100644
--- a/doc/Tk_Init.3
+++ b/doc/Tk_Init.3
@@ -4,23 +4,21 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: Tk_Init.3,v 1.3 2000/04/28 00:46:04 ericm Exp $
+'\" RCS: @(#) $Id: Tk_Init.3,v 1.2 1998/09/14 18:22:54 stanton Exp $
 '\" 
 .so man.macros
-.TH Tk_Init 3 8.0 Tk "Tk Library Procedures"
+.TH Tk_Init 3 4.1 Tk "Tk Library Procedures"
 .BS
 .SH NAME
-Tk_Init, Tk_SafeInit \- add Tk to an interpreter and make a new Tk application.
+Tk_Init \- add Tk to an interpreter and make a new Tk application.
 .SH SYNOPSIS
 .nf
 \fB#include <tk.h>\fR
 .sp
 int
 \fBTk_Init\fR(\fIinterp\fR)
-.sp
-int
-\fBTk_SafeInit\fR(\fIinterp\fR)
 .SH ARGUMENTS
+.AS Tcl_Interp *interp
 .AP Tcl_Interp *interp in
 Interpreter in which to load Tk.  Tk should not already be loaded
 in this interpreter.
@@ -44,46 +42,6 @@ new Tk application.
 The options may have any of the forms documented for the
 \fBwish\fR application (in fact, \fBwish\fR uses Tk_Init to process
 its command-line arguments).
-.PP
-\fBTk_SafeInit\fR is identical to \fBTk_Init\fR except that it removes
-all Tk commands that are considered unsafe.  Those commands and the
-reasons for their exclusion are:
-.TP
-\fBbell\fR
-Continuous ringing of the bell is a nuisance.
-.TP
-\fBclipboard\fR
-A malicious script could replace the contents of the clipboard with
-the string \fB"rm -r *"\fR and lead to surprises when the contents of
-the clipboard are pasted.
-.TP
-\fBgrab\fR
-Grab can be used to block the user from using any other applications.
-.TP
-\fBmenu\fR
-Menus can be used to cover the entire screen and to steal input from
-the user.
-.TP
-\fBselection\fR
-See clipboard.
-.TP
-\fBsend\fR
-Send can be used to cause unsafe interpreters to execute commands.
-.TP
-\fBtk\fR
-The tk command recreates the send command, which is unsafe.
-.TP
-\fBtkwait\fR
-Tkwait can block the containing process forever
-.TP
-\fBtoplevel\fR
-Toplevels can be used to cover the entire screen and to steal input
-from the user.
-.TP
-\fBwm\fR
-If toplevels are ever allowed, wm can be used to remove decorations,
-move windows around, etc.
-.CE
 
 .SH KEYWORDS
-safe, application, initialization, load, main window
+application, initialization, load, main window
diff --git a/doc/bind.n b/doc/bind.n
index 83a00ae..87d7b93 100644
--- a/doc/bind.n
+++ b/doc/bind.n
@@ -6,7 +6,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: bind.n,v 1.4 2000/04/27 18:28:54 ericm Exp $
+'\" RCS: @(#) $Id: bind.n,v 1.3 1998/10/10 00:30:35 rjohnson Exp $
 '\" 
 .so man.macros
 .TH bind n 8.0 Tk "Tk Built-In Commands"
@@ -517,7 +517,7 @@ The \fBbgerror\fR command will be executed at global level
 (outside the context of any Tcl procedure).
 
 .SH "SEE ALSO"
-bgerror, keysyms
+bgerror
 
 .SH KEYWORDS
 form, manual
diff --git a/doc/messageBox.n b/doc/messageBox.n
index 4e6eead..754caf6 100644
--- a/doc/messageBox.n
+++ b/doc/messageBox.n
@@ -4,7 +4,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: messageBox.n,v 1.5 2000/04/27 18:28:58 ericm Exp $
+'\" RCS: @(#) $Id: messageBox.n,v 1.4 1999/09/02 17:02:12 hobbs Exp $
 '\" 
 .so man.macros
 .TH tk_messageBox n 4.2 Tk "Tk Built-In Commands"
@@ -30,8 +30,9 @@ The following option-value pairs are supported:
 \fB\-default\fR \fIname\fR
 \fIName\fR gives the symbolic name of the default button for
 this message window ('ok', 'cancel', and so on). See \fB\-type\fR 
-for a list of the symbolic names.  If this option is not specified,
-the first button in the dialog will be made the default.
+for a list of the symbolic names.  If the message box has just one
+button it will automatically be made the default, otherwise if this
+option is not specified, there won't be any default button.
 .TP
 \fB\-icon\fR \fIiconImage\fR
 Specifies an icon to display. \fIIconImage\fR must be one of the
diff --git a/doc/options.n b/doc/options.n
index a55b071..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.5 2000/04/27 18:28:58 ericm 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"
@@ -325,8 +325,5 @@ scrollbars and is provided by widgets that support vertical scrolling.
 See the description of \fBxScrollCommand\fR for details
 on how this option is used.
 
-.SH SEE ALSO
-colors, cursors
-
 .SH KEYWORDS
 class, name, standard option, switch
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 7fa867f..f486234 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWindow.c,v 1.17 2000/04/28 00:46:04 ericm Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.16 2000/03/24 23:13:18 ericm Exp $
  */
 
 #include "tkPort.h"
@@ -2665,8 +2665,8 @@ Tk_SafeInit(interp)
      * - Continuous ringing of the bell is a nuisance.
      * - Cannot allow access to the clipboard because a malicious script
      *   can replace the contents with the string "rm -r *" and lead to
-     *   surprises when the contents of the clipboard are pasted. Similarly,
-     *   the selection command is blocked.
+     *   surprises when the contents of the clipboard are pasted. We do
+     *   not currently hide the selection command.. Should we?
      * - Cannot allow send because it can be used to cause unsafe
      *   interpreters to execute commands. The tk command recreates the
      *   send command, so that too must be hidden.
diff --git a/library/msgbox.tcl b/library/msgbox.tcl
index 369d4c9..12857d5 100644
--- a/library/msgbox.tcl
+++ b/library/msgbox.tcl
@@ -3,7 +3,7 @@
 #	Implements messageboxes for platforms that do not have native
 #	messagebox support.
 #
-# RCS: @(#) $Id: msgbox.tcl,v 1.11 2000/04/27 18:28:59 ericm Exp $
+# RCS: @(#) $Id: msgbox.tcl,v 1.10 2000/04/19 09:25:53 hobbs Exp $
 #
 # Copyright (c) 1994-1997 Sun Microsystems, Inc.
 #
@@ -214,22 +214,17 @@ proc tkMessageBox {args} {
 	}
     }
 
-    # If no default button was specified, the default default is the 
-    # first button (Bug: 2218).
-
-    if {$data(-default) == ""} {
-	set data(-default) [lindex [lindex $buttons 0] 0]
-    }
-
-    set valid 0
-    foreach btn $buttons {
-	if {[string equal [lindex $btn 0] $data(-default)]} {
-	    set valid 1
-	    break
+    if {[string compare $data(-default) ""]} {
+	set valid 0
+	foreach btn $buttons {
+	    if {[string equal [lindex $btn 0] $data(-default)]} {
+		set valid 1
+		break
+	    }
+	}
+	if {!$valid} {
+	    error "invalid default button \"$data(-default)\""
 	}
-    }
-    if {!$valid} {
-	error "invalid default button \"$data(-default)\""
     }
 
     # 2. Set the dialog to be a child window of $parent
diff --git a/unix/mkLinks b/unix/mkLinks
index 410a6e2..2bff198 100644
--- a/unix/mkLinks
+++ b/unix/mkLinks
@@ -27,174 +27,201 @@ rm xyzzyTe*
 if test "$x" != "xyzzyTestingAVeryLongFileName.foo"; then
     exit
 fi
-
 if test -r 3DBorder.3; then
-    rm -f Tk_Alloc3DBorderFromObj.3
-    rm -f Tk_Get3DBorder.3
-    rm -f Tk_Get3DBorderFromObj.3
-    rm -f Tk_Draw3DRectangle.3
-    rm -f Tk_Fill3DRectangle.3
-    rm -f Tk_Draw3DPolygon.3
-    rm -f Tk_Fill3DPolygon.3
-    rm -f Tk_3DVerticalBevel.3
-    rm -f Tk_3DHorizontalBevel.3
-    rm -f Tk_SetBackgroundFromBorder.3
-    rm -f Tk_NameOf3DBorder.3
     rm -f Tk_3DBorderColor.3
-    rm -f Tk_3DBorderGC.3
-    rm -f Tk_Free3DBorderFromObj.3
-    rm -f Tk_Free3DBorder.3
-    ln 3DBorder.3 Tk_Alloc3DBorderFromObj.3
-    ln 3DBorder.3 Tk_Get3DBorder.3
-    ln 3DBorder.3 Tk_Get3DBorderFromObj.3
-    ln 3DBorder.3 Tk_Draw3DRectangle.3
-    ln 3DBorder.3 Tk_Fill3DRectangle.3
-    ln 3DBorder.3 Tk_Draw3DPolygon.3
-    ln 3DBorder.3 Tk_Fill3DPolygon.3
-    ln 3DBorder.3 Tk_3DVerticalBevel.3
-    ln 3DBorder.3 Tk_3DHorizontalBevel.3
-    ln 3DBorder.3 Tk_SetBackgroundFromBorder.3
-    ln 3DBorder.3 Tk_NameOf3DBorder.3
     ln 3DBorder.3 Tk_3DBorderColor.3
+fi
+if test -r 3DBorder.3; then
+    rm -f Tk_3DBorderGC.3
     ln 3DBorder.3 Tk_3DBorderGC.3
-    ln 3DBorder.3 Tk_Free3DBorderFromObj.3
-    ln 3DBorder.3 Tk_Free3DBorder.3
 fi
-if test -r AddOption.3; then
-    rm -f Tk_AddOption.3
-    ln AddOption.3 Tk_AddOption.3
+if test -r 3DBorder.3; then
+    rm -f Tk_3DHorizontalBevel.3
+    ln 3DBorder.3 Tk_3DHorizontalBevel.3
+fi
+if test -r 3DBorder.3; then
+    rm -f Tk_3DVerticalBevel.3
+    ln 3DBorder.3 Tk_3DVerticalBevel.3
+fi
+if test -r 3DBorder.3; then
+    rm -f Tk_Alloc3DBorderFromObj.3
+    ln 3DBorder.3 Tk_Alloc3DBorderFromObj.3
+fi
+if test -r GetBitmap.3; then
+    rm -f Tk_AllocBitmapFromObj.3
+    ln GetBitmap.3 Tk_AllocBitmapFromObj.3
+fi
+if test -r GetColor.3; then
+    rm -f Tk_AllocColorFromObj.3
+    ln GetColor.3 Tk_AllocColorFromObj.3
+fi
+if test -r GetCursor.3; then
+    rm -f Tk_AllocCursorFromObj.3
+    ln GetCursor.3 Tk_AllocCursorFromObj.3
+fi
+if test -r GetFont.3; then
+    rm -f Tk_AllocFontFromObj.3
+    ln GetFont.3 Tk_AllocFontFromObj.3
+fi
+if test -r Grab.3; then
+    rm -f Tk_Grab.3
+    ln Grab.3 Tk_Grab.3
+fi
+if test -r Grab.3; then
+    rm -f Tk_Ungrab.3
+    ln Grab.3 Tk_Ungrab.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_Attributes.3
+    ln WindowId.3 Tk_Attributes.3
 fi
 if test -r BindTable.3; then
-    rm -f Tk_CreateBindingTable.3
-    rm -f Tk_DeleteBindingTable.3
-    rm -f Tk_CreateBinding.3
-    rm -f Tk_DeleteBinding.3
-    rm -f Tk_GetBinding.3
-    rm -f Tk_GetAllBindings.3
-    rm -f Tk_DeleteAllBindings.3
     rm -f Tk_BindEvent.3
-    ln BindTable.3 Tk_CreateBindingTable.3
-    ln BindTable.3 Tk_DeleteBindingTable.3
-    ln BindTable.3 Tk_CreateBinding.3
-    ln BindTable.3 Tk_DeleteBinding.3
-    ln BindTable.3 Tk_GetBinding.3
-    ln BindTable.3 Tk_GetAllBindings.3
-    ln BindTable.3 Tk_DeleteAllBindings.3
     ln BindTable.3 Tk_BindEvent.3
 fi
+if test -r CanvTkwin.3; then
+    rm -f Tk_CanvasDrawableCoords.3
+    ln CanvTkwin.3 Tk_CanvasDrawableCoords.3
+fi
+if test -r CanvTkwin.3; then
+    rm -f Tk_CanvasEventuallyRedraw.3
+    ln CanvTkwin.3 Tk_CanvasEventuallyRedraw.3
+fi
+if test -r CanvTkwin.3; then
+    rm -f Tk_CanvasGetCoord.3
+    ln CanvTkwin.3 Tk_CanvasGetCoord.3
+fi
 if test -r CanvPsY.3; then
-    rm -f Tk_CanvasPsY.3
     rm -f Tk_CanvasPsBitmap.3
-    rm -f Tk_CanvasPsColor.3
-    rm -f Tk_CanvasPsFont.3
-    rm -f Tk_CanvasPsPath.3
-    rm -f Tk_CanvasPsStipple.3
-    ln CanvPsY.3 Tk_CanvasPsY.3
     ln CanvPsY.3 Tk_CanvasPsBitmap.3
+fi
+if test -r CanvPsY.3; then
+    rm -f Tk_CanvasPsColor.3
     ln CanvPsY.3 Tk_CanvasPsColor.3
+fi
+if test -r CanvPsY.3; then
+    rm -f Tk_CanvasPsFont.3
     ln CanvPsY.3 Tk_CanvasPsFont.3
+fi
+if test -r CanvPsY.3; then
+    rm -f Tk_CanvasPsPath.3
     ln CanvPsY.3 Tk_CanvasPsPath.3
+fi
+if test -r CanvPsY.3; then
+    rm -f Tk_CanvasPsStipple.3
     ln CanvPsY.3 Tk_CanvasPsStipple.3
 fi
+if test -r CanvPsY.3; then
+    rm -f Tk_CanvasPsY.3
+    ln CanvPsY.3 Tk_CanvasPsY.3
+fi
 if test -r CanvTkwin.3; then
-    rm -f Tk_CanvasTkwin.3
-    rm -f Tk_CanvasGetCoord.3
-    rm -f Tk_CanvasDrawableCoords.3
     rm -f Tk_CanvasSetStippleOrigin.3
-    rm -f Tk_CanvasWindowCoords.3
-    rm -f Tk_CanvasEventuallyRedraw.3
-    rm -f Tk_CanvasTagsOption.3
-    ln CanvTkwin.3 Tk_CanvasTkwin.3
-    ln CanvTkwin.3 Tk_CanvasGetCoord.3
-    ln CanvTkwin.3 Tk_CanvasDrawableCoords.3
     ln CanvTkwin.3 Tk_CanvasSetStippleOrigin.3
-    ln CanvTkwin.3 Tk_CanvasWindowCoords.3
-    ln CanvTkwin.3 Tk_CanvasEventuallyRedraw.3
+fi
+if test -r CanvTkwin.3; then
+    rm -f Tk_CanvasTagsOption.3
     ln CanvTkwin.3 Tk_CanvasTagsOption.3
 fi
 if test -r CanvTxtInfo.3; then
     rm -f Tk_CanvasTextInfo.3
     ln CanvTxtInfo.3 Tk_CanvasTextInfo.3
 fi
-if test -r Clipboard.3; then
-    rm -f Tk_ClipboardClear.3
-    rm -f Tk_ClipboardAppend.3
-    ln Clipboard.3 Tk_ClipboardClear.3
-    ln Clipboard.3 Tk_ClipboardAppend.3
+if test -r CanvTkwin.3; then
+    rm -f Tk_CanvasTkwin.3
+    ln CanvTkwin.3 Tk_CanvasTkwin.3
+fi
+if test -r CanvTkwin.3; then
+    rm -f Tk_CanvasWindowCoords.3
+    ln CanvTkwin.3 Tk_CanvasWindowCoords.3
+fi
+if test -r ConfigWind.3; then
+    rm -f Tk_ChangeWindowAttributes.3
+    ln ConfigWind.3 Tk_ChangeWindowAttributes.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_Changes.3
+    ln WindowId.3 Tk_Changes.3
+fi
+if test -r TextLayout.3; then
+    rm -f Tk_CharBbox.3
+    ln TextLayout.3 Tk_CharBbox.3
+fi
+if test -r SetClass.3; then
+    rm -f Tk_Class.3
+    ln SetClass.3 Tk_Class.3
 fi
 if test -r ClrSelect.3; then
     rm -f Tk_ClearSelection.3
     ln ClrSelect.3 Tk_ClearSelection.3
 fi
+if test -r Clipboard.3; then
+    rm -f Tk_ClipboardAppend.3
+    ln Clipboard.3 Tk_ClipboardAppend.3
+fi
+if test -r Clipboard.3; then
+    rm -f Tk_ClipboardClear.3
+    ln Clipboard.3 Tk_ClipboardClear.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_Colormap.3
+    ln WindowId.3 Tk_Colormap.3
+fi
+if test -r TextLayout.3; then
+    rm -f Tk_ComputeTextLayout.3
+    ln TextLayout.3 Tk_ComputeTextLayout.3
+fi
 if test -r ConfigWidg.3; then
-    rm -f Tk_ConfigureWidget.3
-    rm -f Tk_Offset.3
     rm -f Tk_ConfigureInfo.3
-    rm -f Tk_ConfigureValue.3
-    rm -f Tk_FreeOptions.3
-    ln ConfigWidg.3 Tk_ConfigureWidget.3
-    ln ConfigWidg.3 Tk_Offset.3
     ln ConfigWidg.3 Tk_ConfigureInfo.3
+fi
+if test -r ConfigWidg.3; then
+    rm -f Tk_ConfigureValue.3
     ln ConfigWidg.3 Tk_ConfigureValue.3
-    ln ConfigWidg.3 Tk_FreeOptions.3
+fi
+if test -r ConfigWidg.3; then
+    rm -f Tk_ConfigureWidget.3
+    ln ConfigWidg.3 Tk_ConfigureWidget.3
 fi
 if test -r ConfigWind.3; then
     rm -f Tk_ConfigureWindow.3
-    rm -f Tk_MoveWindow.3
-    rm -f Tk_ResizeWindow.3
-    rm -f Tk_MoveResizeWindow.3
-    rm -f Tk_SetWindowBorderWidth.3
-    rm -f Tk_ChangeWindowAttributes.3
-    rm -f Tk_SetWindowBackground.3
-    rm -f Tk_SetWindowBackgroundPixmap.3
-    rm -f Tk_SetWindowBorder.3
-    rm -f Tk_SetWindowBorderPixmap.3
-    rm -f Tk_SetWindowColormap.3
-    rm -f Tk_DefineCursor.3
-    rm -f Tk_UndefineCursor.3
     ln ConfigWind.3 Tk_ConfigureWindow.3
-    ln ConfigWind.3 Tk_MoveWindow.3
-    ln ConfigWind.3 Tk_ResizeWindow.3
-    ln ConfigWind.3 Tk_MoveResizeWindow.3
-    ln ConfigWind.3 Tk_SetWindowBorderWidth.3
-    ln ConfigWind.3 Tk_ChangeWindowAttributes.3
-    ln ConfigWind.3 Tk_SetWindowBackground.3
-    ln ConfigWind.3 Tk_SetWindowBackgroundPixmap.3
-    ln ConfigWind.3 Tk_SetWindowBorder.3
-    ln ConfigWind.3 Tk_SetWindowBorderPixmap.3
-    ln ConfigWind.3 Tk_SetWindowColormap.3
-    ln ConfigWind.3 Tk_DefineCursor.3
-    ln ConfigWind.3 Tk_UndefineCursor.3
 fi
 if test -r CoordToWin.3; then
     rm -f Tk_CoordsToWindow.3
     ln CoordToWin.3 Tk_CoordsToWindow.3
 fi
+if test -r BindTable.3; then
+    rm -f Tk_CreateBinding.3
+    ln BindTable.3 Tk_CreateBinding.3
+fi
+if test -r BindTable.3; then
+    rm -f Tk_CreateBindingTable.3
+    ln BindTable.3 Tk_CreateBindingTable.3
+fi
 if test -r CrtErrHdlr.3; then
     rm -f Tk_CreateErrorHandler.3
-    rm -f Tk_DeleteErrorHandler.3
     ln CrtErrHdlr.3 Tk_CreateErrorHandler.3
-    ln CrtErrHdlr.3 Tk_DeleteErrorHandler.3
+fi
+if test -r EventHndlr.3; then
+    rm -f Tk_CreateEventHandler.3
+    ln EventHndlr.3 Tk_CreateEventHandler.3
 fi
 if test -r CrtGenHdlr.3; then
     rm -f Tk_CreateGenericHandler.3
-    rm -f Tk_DeleteGenericHandler.3
     ln CrtGenHdlr.3 Tk_CreateGenericHandler.3
-    ln CrtGenHdlr.3 Tk_DeleteGenericHandler.3
 fi
 if test -r CrtImgType.3; then
     rm -f Tk_CreateImageType.3
-    rm -f Tk_GetImageMasterData.3
-    rm -f Tk_InitImageArgs.3
     ln CrtImgType.3 Tk_CreateImageType.3
-    ln CrtImgType.3 Tk_GetImageMasterData.3
-    ln CrtImgType.3 Tk_InitImageArgs.3
 fi
 if test -r CrtItemType.3; then
     rm -f Tk_CreateItemType.3
-    rm -f Tk_GetItemTypes.3
     ln CrtItemType.3 Tk_CreateItemType.3
-    ln CrtItemType.3 Tk_GetItemTypes.3
+fi
+if test -r SetOptions.3; then
+    rm -f Tk_CreateOptionTable.3
+    ln SetOptions.3 Tk_CreateOptionTable.3
 fi
 if test -r CrtPhImgFmt.3; then
     rm -f Tk_CreatePhotoImageFormat.3
@@ -202,59 +229,191 @@ if test -r CrtPhImgFmt.3; then
 fi
 if test -r CrtSelHdlr.3; then
     rm -f Tk_CreateSelHandler.3
-    rm -f Tk_DeleteSelHandler.3
     ln CrtSelHdlr.3 Tk_CreateSelHandler.3
-    ln CrtSelHdlr.3 Tk_DeleteSelHandler.3
 fi
 if test -r CrtWindow.3; then
     rm -f Tk_CreateWindow.3
-    rm -f Tk_CreateWindowFromPath.3
-    rm -f Tk_DestroyWindow.3
-    rm -f Tk_MakeWindowExist.3
     ln CrtWindow.3 Tk_CreateWindow.3
+fi
+if test -r CrtWindow.3; then
+    rm -f Tk_CreateWindowFromPath.3
     ln CrtWindow.3 Tk_CreateWindowFromPath.3
-    ln CrtWindow.3 Tk_DestroyWindow.3
-    ln CrtWindow.3 Tk_MakeWindowExist.3
+fi
+if test -r GetBitmap.3; then
+    rm -f Tk_DefineBitmap.3
+    ln GetBitmap.3 Tk_DefineBitmap.3
+fi
+if test -r ConfigWind.3; then
+    rm -f Tk_DefineCursor.3
+    ln ConfigWind.3 Tk_DefineCursor.3
+fi
+if test -r BindTable.3; then
+    rm -f Tk_DeleteAllBindings.3
+    ln BindTable.3 Tk_DeleteAllBindings.3
+fi
+if test -r BindTable.3; then
+    rm -f Tk_DeleteBinding.3
+    ln BindTable.3 Tk_DeleteBinding.3
+fi
+if test -r BindTable.3; then
+    rm -f Tk_DeleteBindingTable.3
+    ln BindTable.3 Tk_DeleteBindingTable.3
+fi
+if test -r CrtErrHdlr.3; then
+    rm -f Tk_DeleteErrorHandler.3
+    ln CrtErrHdlr.3 Tk_DeleteErrorHandler.3
+fi
+if test -r EventHndlr.3; then
+    rm -f Tk_DeleteEventHandler.3
+    ln EventHndlr.3 Tk_DeleteEventHandler.3
+fi
+if test -r CrtGenHdlr.3; then
+    rm -f Tk_DeleteGenericHandler.3
+    ln CrtGenHdlr.3 Tk_DeleteGenericHandler.3
 fi
 if test -r DeleteImg.3; then
     rm -f Tk_DeleteImage.3
     ln DeleteImg.3 Tk_DeleteImage.3
 fi
+if test -r SetOptions.3; then
+    rm -f Tk_DeleteOptionTable.3
+    ln SetOptions.3 Tk_DeleteOptionTable.3
+fi
+if test -r CrtSelHdlr.3; then
+    rm -f Tk_DeleteSelHandler.3
+    ln CrtSelHdlr.3 Tk_DeleteSelHandler.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_Depth.3
+    ln WindowId.3 Tk_Depth.3
+fi
+if test -r CrtWindow.3; then
+    rm -f Tk_DestroyWindow.3
+    ln CrtWindow.3 Tk_DestroyWindow.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_Display.3
+    ln WindowId.3 Tk_Display.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_DisplayName.3
+    ln WindowId.3 Tk_DisplayName.3
+fi
+if test -r TextLayout.3; then
+    rm -f Tk_DistanceToTextLayout.3
+    ln TextLayout.3 Tk_DistanceToTextLayout.3
+fi
+if test -r 3DBorder.3; then
+    rm -f Tk_Draw3DPolygon.3
+    ln 3DBorder.3 Tk_Draw3DPolygon.3
+fi
+if test -r 3DBorder.3; then
+    rm -f Tk_Draw3DRectangle.3
+    ln 3DBorder.3 Tk_Draw3DRectangle.3
+fi
+if test -r MeasureChar.3; then
+    rm -f Tk_DrawChars.3
+    ln MeasureChar.3 Tk_DrawChars.3
+fi
 if test -r DrawFocHlt.3; then
     rm -f Tk_DrawFocusHighlight.3
     ln DrawFocHlt.3 Tk_DrawFocusHighlight.3
 fi
-if test -r EventHndlr.3; then
-    rm -f Tk_CreateEventHandler.3
-    rm -f Tk_DeleteEventHandler.3
-    ln EventHndlr.3 Tk_CreateEventHandler.3
-    ln EventHndlr.3 Tk_DeleteEventHandler.3
+if test -r TextLayout.3; then
+    rm -f Tk_DrawTextLayout.3
+    ln TextLayout.3 Tk_DrawTextLayout.3
+fi
+if test -r 3DBorder.3; then
+    rm -f Tk_Fill3DPolygon.3
+    ln 3DBorder.3 Tk_Fill3DPolygon.3
+fi
+if test -r 3DBorder.3; then
+    rm -f Tk_Fill3DRectangle.3
+    ln 3DBorder.3 Tk_Fill3DRectangle.3
 fi
 if test -r FindPhoto.3; then
     rm -f Tk_FindPhoto.3
-    rm -f Tk_PhotoPutBlock.3
-    rm -f Tk_PhotoPutZoomedBlock.3
-    rm -f Tk_PhotoGetImage.3
-    rm -f Tk_PhotoBlank.3
-    rm -f Tk_PhotoExpand.3
-    rm -f Tk_PhotoGetSize.3
-    rm -f Tk_PhotoSetSize.3
     ln FindPhoto.3 Tk_FindPhoto.3
-    ln FindPhoto.3 Tk_PhotoPutBlock.3
-    ln FindPhoto.3 Tk_PhotoPutZoomedBlock.3
-    ln FindPhoto.3 Tk_PhotoGetImage.3
-    ln FindPhoto.3 Tk_PhotoBlank.3
-    ln FindPhoto.3 Tk_PhotoExpand.3
-    ln FindPhoto.3 Tk_PhotoGetSize.3
-    ln FindPhoto.3 Tk_PhotoSetSize.3
 fi
 if test -r FontId.3; then
     rm -f Tk_FontId.3
-    rm -f Tk_FontMetrics.3
-    rm -f Tk_PostscriptFontName.3
     ln FontId.3 Tk_FontId.3
+fi
+if test -r FontId.3; then
+    rm -f Tk_FontMetrics.3
     ln FontId.3 Tk_FontMetrics.3
-    ln FontId.3 Tk_PostscriptFontName.3
+fi
+if test -r 3DBorder.3; then
+    rm -f Tk_Free3DBorder.3
+    ln 3DBorder.3 Tk_Free3DBorder.3
+fi
+if test -r 3DBorder.3; then
+    rm -f Tk_Free3DBorderFromObj.3
+    ln 3DBorder.3 Tk_Free3DBorderFromObj.3
+fi
+if test -r GetBitmap.3; then
+    rm -f Tk_FreeBitmap.3
+    ln GetBitmap.3 Tk_FreeBitmap.3
+fi
+if test -r GetBitmap.3; then
+    rm -f Tk_FreeBitmapFromObj.3
+    ln GetBitmap.3 Tk_FreeBitmapFromObj.3
+fi
+if test -r GetColor.3; then
+    rm -f Tk_FreeColor.3
+    ln GetColor.3 Tk_FreeColor.3
+fi
+if test -r GetColor.3; then
+    rm -f Tk_FreeColorFromObj.3
+    ln GetColor.3 Tk_FreeColorFromObj.3
+fi
+if test -r GetClrmap.3; then
+    rm -f Tk_FreeColormap.3
+    ln GetClrmap.3 Tk_FreeColormap.3
+fi
+if test -r SetOptions.3; then
+    rm -f Tk_FreeConfigOptions.3
+    ln SetOptions.3 Tk_FreeConfigOptions.3
+fi
+if test -r GetCursor.3; then
+    rm -f Tk_FreeCursor.3
+    ln GetCursor.3 Tk_FreeCursor.3
+fi
+if test -r GetCursor.3; then
+    rm -f Tk_FreeCursorFromObj.3
+    ln GetCursor.3 Tk_FreeCursorFromObj.3
+fi
+if test -r GetFont.3; then
+    rm -f Tk_FreeFont.3
+    ln GetFont.3 Tk_FreeFont.3
+fi
+if test -r GetFont.3; then
+    rm -f Tk_FreeFontFromObj.3
+    ln GetFont.3 Tk_FreeFontFromObj.3
+fi
+if test -r GetGC.3; then
+    rm -f Tk_FreeGC.3
+    ln GetGC.3 Tk_FreeGC.3
+fi
+if test -r GetImage.3; then
+    rm -f Tk_FreeImage.3
+    ln GetImage.3 Tk_FreeImage.3
+fi
+if test -r ConfigWidg.3; then
+    rm -f Tk_FreeOptions.3
+    ln ConfigWidg.3 Tk_FreeOptions.3
+fi
+if test -r GetPixmap.3; then
+    rm -f Tk_FreePixmap.3
+    ln GetPixmap.3 Tk_FreePixmap.3
+fi
+if test -r SetOptions.3; then
+    rm -f Tk_FreeSavedOptions.3
+    ln SetOptions.3 Tk_FreeSavedOptions.3
+fi
+if test -r TextLayout.3; then
+    rm -f Tk_FreeTextLayout.3
+    ln TextLayout.3 Tk_FreeTextLayout.3
 fi
 if test -r FreeXId.3; then
     rm -f Tk_FreeXId.3
@@ -262,174 +421,174 @@ if test -r FreeXId.3; then
 fi
 if test -r GeomReq.3; then
     rm -f Tk_GeometryRequest.3
-    rm -f Tk_SetInternalBorder.3
     ln GeomReq.3 Tk_GeometryRequest.3
-    ln GeomReq.3 Tk_SetInternalBorder.3
+fi
+if test -r 3DBorder.3; then
+    rm -f Tk_Get3DBorder.3
+    ln 3DBorder.3 Tk_Get3DBorder.3
+fi
+if test -r 3DBorder.3; then
+    rm -f Tk_Get3DBorderFromObj.3
+    ln 3DBorder.3 Tk_Get3DBorderFromObj.3
+fi
+if test -r BindTable.3; then
+    rm -f Tk_GetAllBindings.3
+    ln BindTable.3 Tk_GetAllBindings.3
 fi
 if test -r GetAnchor.3; then
-    rm -f Tk_GetAnchorFromObj.3
     rm -f Tk_GetAnchor.3
-    rm -f Tk_NameOfAnchor.3
-    ln GetAnchor.3 Tk_GetAnchorFromObj.3
     ln GetAnchor.3 Tk_GetAnchor.3
-    ln GetAnchor.3 Tk_NameOfAnchor.3
+fi
+if test -r GetAnchor.3; then
+    rm -f Tk_GetAnchorFromObj.3
+    ln GetAnchor.3 Tk_GetAnchorFromObj.3
+fi
+if test -r InternAtom.3; then
+    rm -f Tk_GetAtomName.3
+    ln InternAtom.3 Tk_GetAtomName.3
+fi
+if test -r BindTable.3; then
+    rm -f Tk_GetBinding.3
+    ln BindTable.3 Tk_GetBinding.3
 fi
 if test -r GetBitmap.3; then
-    rm -f Tk_AllocBitmapFromObj.3
     rm -f Tk_GetBitmap.3
-    rm -f Tk_GetBitmapFromObj.3
-    rm -f Tk_DefineBitmap.3
-    rm -f Tk_NameOfBitmap.3
-    rm -f Tk_SizeOfBitmap.3
-    rm -f Tk_FreeBitmapFromObj.3
-    rm -f Tk_FreeBitmap.3
-    rm -f Tk_GetBitmapFromData.3
-    ln GetBitmap.3 Tk_AllocBitmapFromObj.3
     ln GetBitmap.3 Tk_GetBitmap.3
-    ln GetBitmap.3 Tk_GetBitmapFromObj.3
-    ln GetBitmap.3 Tk_DefineBitmap.3
-    ln GetBitmap.3 Tk_NameOfBitmap.3
-    ln GetBitmap.3 Tk_SizeOfBitmap.3
-    ln GetBitmap.3 Tk_FreeBitmapFromObj.3
-    ln GetBitmap.3 Tk_FreeBitmap.3
+fi
+if test -r GetBitmap.3; then
+    rm -f Tk_GetBitmapFromData.3
     ln GetBitmap.3 Tk_GetBitmapFromData.3
 fi
+if test -r GetBitmap.3; then
+    rm -f Tk_GetBitmapFromObj.3
+    ln GetBitmap.3 Tk_GetBitmapFromObj.3
+fi
 if test -r GetCapStyl.3; then
     rm -f Tk_GetCapStyle.3
-    rm -f Tk_NameOfCapStyle.3
     ln GetCapStyl.3 Tk_GetCapStyle.3
-    ln GetCapStyl.3 Tk_NameOfCapStyle.3
-fi
-if test -r GetClrmap.3; then
-    rm -f Tk_GetColormap.3
-    rm -f Tk_FreeColormap.3
-    ln GetClrmap.3 Tk_GetColormap.3
-    ln GetClrmap.3 Tk_FreeColormap.3
 fi
 if test -r GetColor.3; then
-    rm -f Tk_AllocColorFromObj.3
     rm -f Tk_GetColor.3
-    rm -f Tk_GetColorFromObj.3
-    rm -f Tk_GetColorByValue.3
-    rm -f Tk_NameOfColor.3
-    rm -f Tk_FreeColorFromObj.3
-    rm -f Tk_FreeColor.3
-    ln GetColor.3 Tk_AllocColorFromObj.3
     ln GetColor.3 Tk_GetColor.3
-    ln GetColor.3 Tk_GetColorFromObj.3
+fi
+if test -r GetColor.3; then
+    rm -f Tk_GetColorByValue.3
     ln GetColor.3 Tk_GetColorByValue.3
-    ln GetColor.3 Tk_NameOfColor.3
-    ln GetColor.3 Tk_FreeColorFromObj.3
-    ln GetColor.3 Tk_FreeColor.3
+fi
+if test -r GetColor.3; then
+    rm -f Tk_GetColorFromObj.3
+    ln GetColor.3 Tk_GetColorFromObj.3
+fi
+if test -r GetClrmap.3; then
+    rm -f Tk_GetColormap.3
+    ln GetClrmap.3 Tk_GetColormap.3
 fi
 if test -r GetCursor.3; then
-    rm -f Tk_AllocCursorFromObj.3
     rm -f Tk_GetCursor.3
-    rm -f Tk_GetCursorFromObj.3
-    rm -f Tk_GetCursorFromData.3
-    rm -f Tk_NameOfCursor.3
-    rm -f Tk_FreeCursorFromObj.3
-    rm -f Tk_FreeCursor.3
-    ln GetCursor.3 Tk_AllocCursorFromObj.3
     ln GetCursor.3 Tk_GetCursor.3
-    ln GetCursor.3 Tk_GetCursorFromObj.3
+fi
+if test -r GetCursor.3; then
+    rm -f Tk_GetCursorFromData.3
     ln GetCursor.3 Tk_GetCursorFromData.3
-    ln GetCursor.3 Tk_NameOfCursor.3
-    ln GetCursor.3 Tk_FreeCursorFromObj.3
-    ln GetCursor.3 Tk_FreeCursor.3
 fi
-if test -r GetDash.3; then
-    rm -f Tk_GetDash.3
-    ln GetDash.3 Tk_GetDash.3
+if test -r GetCursor.3; then
+    rm -f Tk_GetCursorFromObj.3
+    ln GetCursor.3 Tk_GetCursorFromObj.3
 fi
 if test -r GetFont.3; then
-    rm -f Tk_AllocFontFromObj.3
     rm -f Tk_GetFont.3
-    rm -f Tk_GetFontFromObj.3
-    rm -f Tk_NameOfFont.3
-    rm -f Tk_FreeFontFromObj.3
-    rm -f Tk_FreeFont.3
-    ln GetFont.3 Tk_AllocFontFromObj.3
     ln GetFont.3 Tk_GetFont.3
+fi
+if test -r GetFont.3; then
+    rm -f Tk_GetFontFromObj.3
     ln GetFont.3 Tk_GetFontFromObj.3
-    ln GetFont.3 Tk_NameOfFont.3
-    ln GetFont.3 Tk_FreeFontFromObj.3
-    ln GetFont.3 Tk_FreeFont.3
 fi
 if test -r GetGC.3; then
     rm -f Tk_GetGC.3
-    rm -f Tk_FreeGC.3
     ln GetGC.3 Tk_GetGC.3
-    ln GetGC.3 Tk_FreeGC.3
-fi
-if test -r GetHINSTANCE.3; then
-    rm -f Tk_GetHINSTANCE.3
-    ln GetHINSTANCE.3 Tk_GetHINSTANCE.3
-fi
-if test -r GetHWND.3; then
-    rm -f Tk_GetHWND.3
-    ln GetHWND.3 Tk_GetHWND.3
 fi
 if test -r GetImage.3; then
     rm -f Tk_GetImage.3
-    rm -f Tk_RedrawImage.3
-    rm -f Tk_SizeOfImage.3
-    rm -f Tk_FreeImage.3
     ln GetImage.3 Tk_GetImage.3
-    ln GetImage.3 Tk_RedrawImage.3
-    ln GetImage.3 Tk_SizeOfImage.3
-    ln GetImage.3 Tk_FreeImage.3
+fi
+if test -r CrtImgType.3; then
+    rm -f Tk_GetImageMasterData.3
+    ln CrtImgType.3 Tk_GetImageMasterData.3
+fi
+if test -r CrtItemType.3; then
+    rm -f Tk_GetItemTypes.3
+    ln CrtItemType.3 Tk_GetItemTypes.3
+fi
+if test -r GetDash.3; then
+    rm -f Tk_GetDash.3
+    ln GetDash.3 Tk_GetDash.3
 fi
 if test -r GetJoinStl.3; then
     rm -f Tk_GetJoinStyle.3
-    rm -f Tk_NameOfJoinStyle.3
     ln GetJoinStl.3 Tk_GetJoinStyle.3
-    ln GetJoinStl.3 Tk_NameOfJoinStyle.3
 fi
 if test -r GetJustify.3; then
-    rm -f Tk_GetJustifyFromObj.3
     rm -f Tk_GetJustify.3
-    rm -f Tk_NameOfJustify.3
-    ln GetJustify.3 Tk_GetJustifyFromObj.3
     ln GetJustify.3 Tk_GetJustify.3
-    ln GetJustify.3 Tk_NameOfJustify.3
+fi
+if test -r GetJustify.3; then
+    rm -f Tk_GetJustifyFromObj.3
+    ln GetJustify.3 Tk_GetJustifyFromObj.3
+fi
+if test -r GetPixels.3; then
+    rm -f Tk_GetMMFromObj.3
+    ln GetPixels.3 Tk_GetMMFromObj.3
 fi
 if test -r GetOption.3; then
     rm -f Tk_GetOption.3
     ln GetOption.3 Tk_GetOption.3
 fi
+if test -r AddOption.3; then
+    rm -f Tk_AddOption.3
+    ln AddOption.3 Tk_AddOption.3
+fi
+if test -r SetOptions.3; then
+    rm -f Tk_GetOptionInfo.3
+    ln SetOptions.3 Tk_GetOptionInfo.3
+fi
+if test -r SetOptions.3; then
+    rm -f Tk_GetOptionValue.3
+    ln SetOptions.3 Tk_GetOptionValue.3
+fi
 if test -r GetPixels.3; then
-    rm -f Tk_GetPixelsFromObj.3
     rm -f Tk_GetPixels.3
-    rm -f Tk_GetMMFromObj.3
-    rm -f Tk_GetScreenMM.3
-    ln GetPixels.3 Tk_GetPixelsFromObj.3
     ln GetPixels.3 Tk_GetPixels.3
-    ln GetPixels.3 Tk_GetMMFromObj.3
-    ln GetPixels.3 Tk_GetScreenMM.3
+fi
+if test -r GetPixels.3; then
+    rm -f Tk_GetPixelsFromObj.3
+    ln GetPixels.3 Tk_GetPixelsFromObj.3
 fi
 if test -r GetPixmap.3; then
     rm -f Tk_GetPixmap.3
-    rm -f Tk_FreePixmap.3
     ln GetPixmap.3 Tk_GetPixmap.3
-    ln GetPixmap.3 Tk_FreePixmap.3
 fi
 if test -r GetRelief.3; then
-    rm -f Tk_GetReliefFromObj.3
     rm -f Tk_GetRelief.3
-    rm -f Tk_NameOfRelief.3
-    ln GetRelief.3 Tk_GetReliefFromObj.3
     ln GetRelief.3 Tk_GetRelief.3
-    ln GetRelief.3 Tk_NameOfRelief.3
+fi
+if test -r GetRelief.3; then
+    rm -f Tk_GetReliefFromObj.3
+    ln GetRelief.3 Tk_GetReliefFromObj.3
 fi
 if test -r GetRootCrd.3; then
     rm -f Tk_GetRootCoords.3
     ln GetRootCrd.3 Tk_GetRootCoords.3
 fi
+if test -r GetPixels.3; then
+    rm -f Tk_GetScreenMM.3
+    ln GetPixels.3 Tk_GetScreenMM.3
+fi
 if test -r GetScroll.3; then
     rm -f Tk_GetScrollInfo.3
-    rm -f Tk_GetScrollInfoObj.3
     ln GetScroll.3 Tk_GetScrollInfo.3
+fi
+if test -r GetScroll.3; then
+    rm -f Tk_GetScrollInfoObj.3
     ln GetScroll.3 Tk_GetScrollInfoObj.3
 fi
 if test -r GetSelect.3; then
@@ -438,9 +597,7 @@ if test -r GetSelect.3; then
 fi
 if test -r GetUid.3; then
     rm -f Tk_GetUid.3
-    rm -f Tk_Uid.3
     ln GetUid.3 Tk_GetUid.3
-    ln GetUid.3 Tk_Uid.3
 fi
 if test -r GetVRoot.3; then
     rm -f Tk_GetVRootGeometry.3
@@ -450,33 +607,65 @@ if test -r GetVisual.3; then
     rm -f Tk_GetVisual.3
     ln GetVisual.3 Tk_GetVisual.3
 fi
-if test -r Grab.3; then
-    rm -f Tk_Grab.3
-    rm -f Tk_Ungrab.3
-    ln Grab.3 Tk_Grab.3
-    ln Grab.3 Tk_Ungrab.3
-fi
-if test -r HWNDToWindow.3; then
-    rm -f Tk_HWNDToWindow.3
-    ln HWNDToWindow.3 Tk_HWNDToWindow.3
-fi
 if test -r HandleEvent.3; then
     rm -f Tk_HandleEvent.3
     ln HandleEvent.3 Tk_HandleEvent.3
 fi
+if test -r WindowId.3; then
+    rm -f Tk_Height.3
+    ln WindowId.3 Tk_Height.3
+fi
+if test -r GetHWND.3; then
+    rm -f Tk_GetHWND.3
+    ln GetHWND.3 Tk_GetHWND.3
+fi
+if test -r GetHINSTANCE.3; then
+    rm -f Tk_GetHINSTANCE.3
+    ln GetHINSTANCE.3 Tk_GetHINSTANCE.3
+fi
 if test -r IdToWindow.3; then
     rm -f Tk_IdToWindow.3
     ln IdToWindow.3 Tk_IdToWindow.3
 fi
+if test -r HWNDToWindow.3; then
+    rm -f Tk_HWNDToWindow.3
+    ln HWNDToWindow.3 Tk_HWNDToWindow.3
+fi
 if test -r ImgChanged.3; then
     rm -f Tk_ImageChanged.3
     ln ImgChanged.3 Tk_ImageChanged.3
 fi
+if test -r SetOptions.3; then
+    rm -f Tk_InitOptions.3
+    ln SetOptions.3 Tk_InitOptions.3
+fi
 if test -r InternAtom.3; then
     rm -f Tk_InternAtom.3
-    rm -f Tk_GetAtomName.3
     ln InternAtom.3 Tk_InternAtom.3
-    ln InternAtom.3 Tk_GetAtomName.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_InternalBorderWidth.3
+    ln WindowId.3 Tk_InternalBorderWidth.3
+fi
+if test -r TextLayout.3; then
+    rm -f Tk_IntersectTextLayout.3
+    ln TextLayout.3 Tk_IntersectTextLayout.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_IsContainer.3
+    ln WindowId.3 Tk_IsContainer.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_IsEmbedded.3
+    ln WindowId.3 Tk_IsEmbedded.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_IsMapped.3
+    ln WindowId.3 Tk_IsMapped.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_IsTopLevel.3
+    ln WindowId.3 Tk_IsTopLevel.3
 fi
 if test -r MainLoop.3; then
     rm -f Tk_MainLoop.3
@@ -484,15 +673,19 @@ if test -r MainLoop.3; then
 fi
 if test -r MainWin.3; then
     rm -f Tk_MainWindow.3
-    rm -f Tk_GetNumMainWindows.3
     ln MainWin.3 Tk_MainWindow.3
+fi
+if test -r MainWin.3; then
+    rm -f Tk_GetNumMainWindows.3
     ln MainWin.3 Tk_GetNumMainWindows.3
 fi
 if test -r MaintGeom.3; then
     rm -f Tk_MaintainGeometry.3
-    rm -f Tk_UnmaintainGeometry.3
     ln MaintGeom.3 Tk_MaintainGeometry.3
-    ln MaintGeom.3 Tk_UnmaintainGeometry.3
+fi
+if test -r CrtWindow.3; then
+    rm -f Tk_MakeWindowExist.3
+    ln CrtWindow.3 Tk_MakeWindowExist.3
 fi
 if test -r ManageGeom.3; then
     rm -f Tk_ManageGeometry.3
@@ -500,175 +693,299 @@ if test -r ManageGeom.3; then
 fi
 if test -r MapWindow.3; then
     rm -f Tk_MapWindow.3
-    rm -f Tk_UnmapWindow.3
     ln MapWindow.3 Tk_MapWindow.3
-    ln MapWindow.3 Tk_UnmapWindow.3
 fi
 if test -r MeasureChar.3; then
     rm -f Tk_MeasureChars.3
-    rm -f Tk_TextWidth.3
-    rm -f Tk_DrawChars.3
-    rm -f Tk_UnderlineChars.3
     ln MeasureChar.3 Tk_MeasureChars.3
-    ln MeasureChar.3 Tk_TextWidth.3
-    ln MeasureChar.3 Tk_DrawChars.3
-    ln MeasureChar.3 Tk_UnderlineChars.3
+fi
+if test -r ConfigWind.3; then
+    rm -f Tk_MoveResizeWindow.3
+    ln ConfigWind.3 Tk_MoveResizeWindow.3
 fi
 if test -r MoveToplev.3; then
     rm -f Tk_MoveToplevelWindow.3
     ln MoveToplev.3 Tk_MoveToplevelWindow.3
 fi
+if test -r ConfigWind.3; then
+    rm -f Tk_MoveWindow.3
+    ln ConfigWind.3 Tk_MoveWindow.3
+fi
 if test -r Name.3; then
     rm -f Tk_Name.3
-    rm -f Tk_PathName.3
-    rm -f Tk_NameToWindow.3
     ln Name.3 Tk_Name.3
-    ln Name.3 Tk_PathName.3
-    ln Name.3 Tk_NameToWindow.3
+fi
+if test -r 3DBorder.3; then
+    rm -f Tk_NameOf3DBorder.3
+    ln 3DBorder.3 Tk_NameOf3DBorder.3
+fi
+if test -r GetAnchor.3; then
+    rm -f Tk_NameOfAnchor.3
+    ln GetAnchor.3 Tk_NameOfAnchor.3
+fi
+if test -r GetBitmap.3; then
+    rm -f Tk_NameOfBitmap.3
+    ln GetBitmap.3 Tk_NameOfBitmap.3
+fi
+if test -r GetCapStyl.3; then
+    rm -f Tk_NameOfCapStyle.3
+    ln GetCapStyl.3 Tk_NameOfCapStyle.3
+fi
+if test -r GetColor.3; then
+    rm -f Tk_NameOfColor.3
+    ln GetColor.3 Tk_NameOfColor.3
+fi
+if test -r GetCursor.3; then
+    rm -f Tk_NameOfCursor.3
+    ln GetCursor.3 Tk_NameOfCursor.3
+fi
+if test -r GetFont.3; then
+    rm -f Tk_NameOfFont.3
+    ln GetFont.3 Tk_NameOfFont.3
 fi
 if test -r NameOfImg.3; then
     rm -f Tk_NameOfImage.3
     ln NameOfImg.3 Tk_NameOfImage.3
 fi
+if test -r GetJoinStl.3; then
+    rm -f Tk_NameOfJoinStyle.3
+    ln GetJoinStl.3 Tk_NameOfJoinStyle.3
+fi
+if test -r GetJustify.3; then
+    rm -f Tk_NameOfJustify.3
+    ln GetJustify.3 Tk_NameOfJustify.3
+fi
+if test -r GetRelief.3; then
+    rm -f Tk_NameOfRelief.3
+    ln GetRelief.3 Tk_NameOfRelief.3
+fi
+if test -r Name.3; then
+    rm -f Tk_NameToWindow.3
+    ln Name.3 Tk_NameToWindow.3
+fi
+if test -r SetOptions.3; then
+    rm -f Tk_Offset.3
+    ln SetOptions.3 Tk_Offset.3
+fi
 if test -r OwnSelect.3; then
     rm -f Tk_OwnSelection.3
     ln OwnSelect.3 Tk_OwnSelection.3
 fi
+if test -r WindowId.3; then
+    rm -f Tk_Parent.3
+    ln WindowId.3 Tk_Parent.3
+fi
 if test -r ParseArgv.3; then
     rm -f Tk_ParseArgv.3
     ln ParseArgv.3 Tk_ParseArgv.3
 fi
+if test -r Name.3; then
+    rm -f Tk_PathName.3
+    ln Name.3 Tk_PathName.3
+fi
+if test -r FindPhoto.3; then
+    rm -f Tk_PhotoBlank.3
+    ln FindPhoto.3 Tk_PhotoBlank.3
+fi
+if test -r FindPhoto.3; then
+    rm -f Tk_PhotoExpand.3
+    ln FindPhoto.3 Tk_PhotoExpand.3
+fi
+if test -r FindPhoto.3; then
+    rm -f Tk_PhotoGetImage.3
+    ln FindPhoto.3 Tk_PhotoGetImage.3
+fi
+if test -r FindPhoto.3; then
+    rm -f Tk_PhotoGetSize.3
+    ln FindPhoto.3 Tk_PhotoGetSize.3
+fi
+if test -r FindPhoto.3; then
+    rm -f Tk_PhotoPutBlock.3
+    ln FindPhoto.3 Tk_PhotoPutBlock.3
+fi
+if test -r FindPhoto.3; then
+    rm -f Tk_PhotoPutZoomedBlock.3
+    ln FindPhoto.3 Tk_PhotoPutZoomedBlock.3
+fi
+if test -r FindPhoto.3; then
+    rm -f Tk_PhotoSetSize.3
+    ln FindPhoto.3 Tk_PhotoSetSize.3
+fi
+if test -r TextLayout.3; then
+    rm -f Tk_PointToChar.3
+    ln TextLayout.3 Tk_PointToChar.3
+fi
+if test -r FontId.3; then
+    rm -f Tk_PostscriptFontName.3
+    ln FontId.3 Tk_PostscriptFontName.3
+fi
 if test -r QWinEvent.3; then
     rm -f Tk_QueueWindowEvent.3
     ln QWinEvent.3 Tk_QueueWindowEvent.3
 fi
+if test -r GetImage.3; then
+    rm -f Tk_RedrawImage.3
+    ln GetImage.3 Tk_RedrawImage.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_ReqHeight.3
+    ln WindowId.3 Tk_ReqHeight.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_ReqWidth.3
+    ln WindowId.3 Tk_ReqWidth.3
+fi
+if test -r ConfigWind.3; then
+    rm -f Tk_ResizeWindow.3
+    ln ConfigWind.3 Tk_ResizeWindow.3
+fi
 if test -r Restack.3; then
     rm -f Tk_RestackWindow.3
     ln Restack.3 Tk_RestackWindow.3
 fi
+if test -r SetOptions.3; then
+    rm -f Tk_RestoreSavedOptions.3
+    ln SetOptions.3 Tk_RestoreSavedOptions.3
+fi
 if test -r RestrictEv.3; then
     rm -f Tk_RestrictEvents.3
     ln RestrictEv.3 Tk_RestrictEvents.3
 fi
+if test -r WindowId.3; then
+    rm -f Tk_Screen.3
+    ln WindowId.3 Tk_Screen.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_ScreenNumber.3
+    ln WindowId.3 Tk_ScreenNumber.3
+fi
 if test -r SetAppName.3; then
     rm -f Tk_SetAppName.3
     ln SetAppName.3 Tk_SetAppName.3
 fi
+if test -r 3DBorder.3; then
+    rm -f Tk_SetBackgroundFromBorder.3
+    ln 3DBorder.3 Tk_SetBackgroundFromBorder.3
+fi
 if test -r SetClass.3; then
     rm -f Tk_SetClass.3
-    rm -f Tk_Class.3
     ln SetClass.3 Tk_SetClass.3
-    ln SetClass.3 Tk_Class.3
 fi
 if test -r SetGrid.3; then
     rm -f Tk_SetGrid.3
-    rm -f Tk_UnsetGrid.3
     ln SetGrid.3 Tk_SetGrid.3
-    ln SetGrid.3 Tk_UnsetGrid.3
+fi
+if test -r GeomReq.3; then
+    rm -f Tk_SetInternalBorder.3
+    ln GeomReq.3 Tk_SetInternalBorder.3
 fi
 if test -r SetOptions.3; then
-    rm -f Tk_CreateOptionTable.3
-    rm -f Tk_DeleteOptionTable.3
-    rm -f Tk_InitOptions.3
     rm -f Tk_SetOptions.3
-    rm -f Tk_FreeSavedOptions.3
-    rm -f Tk_RestoreSavedOptions.3
-    rm -f Tk_GetOptionValue.3
-    rm -f Tk_GetOptionInfo.3
-    rm -f Tk_FreeConfigOptions.3
-    rm -f Tk_Offset.3
-    ln SetOptions.3 Tk_CreateOptionTable.3
-    ln SetOptions.3 Tk_DeleteOptionTable.3
-    ln SetOptions.3 Tk_InitOptions.3
     ln SetOptions.3 Tk_SetOptions.3
-    ln SetOptions.3 Tk_FreeSavedOptions.3
-    ln SetOptions.3 Tk_RestoreSavedOptions.3
-    ln SetOptions.3 Tk_GetOptionValue.3
-    ln SetOptions.3 Tk_GetOptionInfo.3
-    ln SetOptions.3 Tk_FreeConfigOptions.3
-    ln SetOptions.3 Tk_Offset.3
+fi
+if test -r ConfigWind.3; then
+    rm -f Tk_SetWindowBackground.3
+    ln ConfigWind.3 Tk_SetWindowBackground.3
+fi
+if test -r ConfigWind.3; then
+    rm -f Tk_SetWindowBackgroundPixmap.3
+    ln ConfigWind.3 Tk_SetWindowBackgroundPixmap.3
+fi
+if test -r ConfigWind.3; then
+    rm -f Tk_SetWindowBorder.3
+    ln ConfigWind.3 Tk_SetWindowBorder.3
+fi
+if test -r ConfigWind.3; then
+    rm -f Tk_SetWindowBorderPixmap.3
+    ln ConfigWind.3 Tk_SetWindowBorderPixmap.3
+fi
+if test -r ConfigWind.3; then
+    rm -f Tk_SetWindowBorderWidth.3
+    ln ConfigWind.3 Tk_SetWindowBorderWidth.3
+fi
+if test -r ConfigWind.3; then
+    rm -f Tk_SetWindowColormap.3
+    ln ConfigWind.3 Tk_SetWindowColormap.3
 fi
 if test -r SetVisual.3; then
     rm -f Tk_SetWindowVisual.3
     ln SetVisual.3 Tk_SetWindowVisual.3
 fi
+if test -r GetBitmap.3; then
+    rm -f Tk_SizeOfBitmap.3
+    ln GetBitmap.3 Tk_SizeOfBitmap.3
+fi
+if test -r GetImage.3; then
+    rm -f Tk_SizeOfImage.3
+    ln GetImage.3 Tk_SizeOfImage.3
+fi
 if test -r StrictMotif.3; then
     rm -f Tk_StrictMotif.3
     ln StrictMotif.3 Tk_StrictMotif.3
 fi
 if test -r TextLayout.3; then
-    rm -f Tk_ComputeTextLayout.3
-    rm -f Tk_FreeTextLayout.3
-    rm -f Tk_DrawTextLayout.3
-    rm -f Tk_UnderlineTextLayout.3
-    rm -f Tk_PointToChar.3
-    rm -f Tk_CharBbox.3
-    rm -f Tk_DistanceToTextLayout.3
-    rm -f Tk_IntersectTextLayout.3
     rm -f Tk_TextLayoutToPostscript.3
-    ln TextLayout.3 Tk_ComputeTextLayout.3
-    ln TextLayout.3 Tk_FreeTextLayout.3
-    ln TextLayout.3 Tk_DrawTextLayout.3
-    ln TextLayout.3 Tk_UnderlineTextLayout.3
-    ln TextLayout.3 Tk_PointToChar.3
-    ln TextLayout.3 Tk_CharBbox.3
-    ln TextLayout.3 Tk_DistanceToTextLayout.3
-    ln TextLayout.3 Tk_IntersectTextLayout.3
     ln TextLayout.3 Tk_TextLayoutToPostscript.3
 fi
-if test -r TkInitStubs.3; then
-    rm -f Tk_InitStubs.3
-    ln TkInitStubs.3 Tk_InitStubs.3
+if test -r MeasureChar.3; then
+    rm -f Tk_TextWidth.3
+    ln MeasureChar.3 Tk_TextWidth.3
+fi
+if test -r GetUid.3; then
+    rm -f Tk_Uid.3
+    ln GetUid.3 Tk_Uid.3
+fi
+if test -r ConfigWind.3; then
+    rm -f Tk_UndefineCursor.3
+    ln ConfigWind.3 Tk_UndefineCursor.3
+fi
+if test -r MeasureChar.3; then
+    rm -f Tk_UnderlineChars.3
+    ln MeasureChar.3 Tk_UnderlineChars.3
+fi
+if test -r TextLayout.3; then
+    rm -f Tk_UnderlineTextLayout.3
+    ln TextLayout.3 Tk_UnderlineTextLayout.3
+fi
+if test -r MaintGeom.3; then
+    rm -f Tk_UnmaintainGeometry.3
+    ln MaintGeom.3 Tk_UnmaintainGeometry.3
+fi
+if test -r MapWindow.3; then
+    rm -f Tk_UnmapWindow.3
+    ln MapWindow.3 Tk_UnmapWindow.3
 fi
-if test -r Tk_Init.3; then
-    rm -f Tk_SafeInit.3
-    ln Tk_Init.3 Tk_SafeInit.3
+if test -r SetGrid.3; then
+    rm -f Tk_UnsetGrid.3
+    ln SetGrid.3 Tk_UnsetGrid.3
 fi
 if test -r WindowId.3; then
-    rm -f Tk_WindowId.3
-    rm -f Tk_Parent.3
-    rm -f Tk_Display.3
-    rm -f Tk_DisplayName.3
-    rm -f Tk_ScreenNumber.3
-    rm -f Tk_Screen.3
-    rm -f Tk_X.3
-    rm -f Tk_Y.3
-    rm -f Tk_Width.3
-    rm -f Tk_Height.3
-    rm -f Tk_Changes.3
-    rm -f Tk_Attributes.3
-    rm -f Tk_IsContainer.3
-    rm -f Tk_IsEmbedded.3
-    rm -f Tk_IsMapped.3
-    rm -f Tk_IsTopLevel.3
-    rm -f Tk_ReqWidth.3
-    rm -f Tk_ReqHeight.3
-    rm -f Tk_InternalBorderWidth.3
     rm -f Tk_Visual.3
-    rm -f Tk_Depth.3
-    rm -f Tk_Colormap.3
+    ln WindowId.3 Tk_Visual.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_Width.3
+    ln WindowId.3 Tk_Width.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_WindowId.3
     ln WindowId.3 Tk_WindowId.3
-    ln WindowId.3 Tk_Parent.3
-    ln WindowId.3 Tk_Display.3
-    ln WindowId.3 Tk_DisplayName.3
-    ln WindowId.3 Tk_ScreenNumber.3
-    ln WindowId.3 Tk_Screen.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_X.3
     ln WindowId.3 Tk_X.3
+fi
+if test -r WindowId.3; then
+    rm -f Tk_Y.3
     ln WindowId.3 Tk_Y.3
-    ln WindowId.3 Tk_Width.3
-    ln WindowId.3 Tk_Height.3
-    ln WindowId.3 Tk_Changes.3
-    ln WindowId.3 Tk_Attributes.3
-    ln WindowId.3 Tk_IsContainer.3
-    ln WindowId.3 Tk_IsEmbedded.3
-    ln WindowId.3 Tk_IsMapped.3
-    ln WindowId.3 Tk_IsTopLevel.3
-    ln WindowId.3 Tk_ReqWidth.3
-    ln WindowId.3 Tk_ReqHeight.3
-    ln WindowId.3 Tk_InternalBorderWidth.3
-    ln WindowId.3 Tk_Visual.3
-    ln WindowId.3 Tk_Depth.3
-    ln WindowId.3 Tk_Colormap.3
+fi
+if test -r menubar.n; then
+    rm -f tk_bindForTraversal.n
+    ln menubar.n tk_bindForTraversal.n
+fi
+if test -r palette.n; then
+    rm -f tk_bisque.n
+    ln palette.n tk_bisque.n
 fi
 if test -r chooseColor.n; then
     rm -f tk_chooseColor.n
@@ -683,24 +1000,28 @@ if test -r dialog.n; then
     ln dialog.n tk_dialog.n
 fi
 if test -r focusNext.n; then
-    rm -f tk_focusNext.n
-    rm -f tk_focusPrev.n
     rm -f tk_focusFollowsMouse.n
+    ln focusNext.n tk_focusFollowsMouse.n
+fi
+if test -r focusNext.n; then
+    rm -f tk_focusNext.n
     ln focusNext.n tk_focusNext.n
+fi
+if test -r focusNext.n; then
+    rm -f tk_focusPrev.n
     ln focusNext.n tk_focusPrev.n
-    ln focusNext.n tk_focusFollowsMouse.n
 fi
 if test -r getOpenFile.n; then
     rm -f tk_getOpenFile.n
-    rm -f tk_getSaveFile.n
     ln getOpenFile.n tk_getOpenFile.n
+fi
+if test -r getOpenFile.n; then
+    rm -f tk_getSaveFile.n
     ln getOpenFile.n tk_getSaveFile.n
 fi
 if test -r menubar.n; then
     rm -f tk_menuBar.n
-    rm -f tk_bindForTraversal.n
     ln menubar.n tk_menuBar.n
-    ln menubar.n tk_bindForTraversal.n
 fi
 if test -r messageBox.n; then
     rm -f tk_messageBox.n
@@ -710,14 +1031,12 @@ if test -r optionMenu.n; then
     rm -f tk_optionMenu.n
     ln optionMenu.n tk_optionMenu.n
 fi
-if test -r palette.n; then
-    rm -f tk_setPalette.n
-    rm -f tk_bisque.n
-    ln palette.n tk_setPalette.n
-    ln palette.n tk_bisque.n
-fi
 if test -r popup.n; then
     rm -f tk_popup.n
     ln popup.n tk_popup.n
 fi
+if test -r palette.n; then
+    rm -f tk_setPalette.n
+    ln palette.n tk_setPalette.n
+fi
 exit 0
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 7be7598..c0233cc 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinWm.c,v 1.22 2000/04/15 17:38:13 hobbs Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.22.2.1 2000/05/12 21:04:16 hobbs Exp $
  */
 
 #include "tkWinInt.h"
@@ -4559,7 +4559,8 @@ RaiseWinWhenIdle(clientData)
 {
     register TkWindow *winPtr = (TkWindow *) clientData;
 
-    if ((winPtr == NULL) || (winPtr->flags & TK_ALREADY_DEAD)) {
+    if ((winPtr == NULL)
+	    || (winPtr->flags & (TK_ALREADY_DEAD|TK_DONT_DESTROY_WINDOW))) {
 	return;
     }
     if (winPtr->wmInfoPtr->flags & WM_UPDATE_PENDING) {