* Merged 8.1 branch into the main trunk

1 files changed, 118 insertions, 2 deletions

diff --git a/unix/mkLinks b/unix/mkLinks
index d817703..5b326b6 100644
--- a/unix/mkLinks
+++ b/unix/mkLinks
@@ -43,6 +43,26 @@ 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 WindowId.3; then
     rm -f Tk_Attributes.3
     ln WindowId.3 Tk_Attributes.3
@@ -191,6 +211,10 @@ if test -r CrtItemType.3; then
     rm -f Tk_CreateItemType.3
     ln CrtItemType.3 Tk_CreateItemType.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
     ln CrtPhImgFmt.3 Tk_CreatePhotoImageFormat.3
@@ -243,6 +267,10 @@ 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
@@ -311,26 +339,50 @@ 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
@@ -347,6 +399,10 @@ 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
@@ -363,6 +419,10 @@ 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
@@ -371,6 +431,10 @@ if test -r GetAnchor.3; then
     rm -f Tk_GetAnchor.3
     ln GetAnchor.3 Tk_GetAnchor.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
@@ -387,6 +451,10 @@ 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
     ln GetCapStyl.3 Tk_GetCapStyle.3
@@ -399,6 +467,10 @@ if test -r GetColor.3; then
     rm -f Tk_GetColorByValue.3
     ln GetColor.3 Tk_GetColorByValue.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
@@ -411,10 +483,18 @@ if test -r GetCursor.3; then
     rm -f Tk_GetCursorFromData.3
     ln GetCursor.3 Tk_GetCursorFromData.3
 fi
+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_GetFont.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
+fi
 if test -r GetGC.3; then
     rm -f Tk_GetGC.3
     ln GetGC.3 Tk_GetGC.3
@@ -439,14 +519,34 @@ if test -r GetJustify.3; then
     rm -f Tk_GetJustify.3
     ln GetJustify.3 Tk_GetJustify.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 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_GetPixels.3
     ln GetPixels.3 Tk_GetPixels.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
     ln GetPixmap.3 Tk_GetPixmap.3
@@ -455,6 +555,10 @@ if test -r GetRelief.3; then
     rm -f Tk_GetRelief.3
     ln GetRelief.3 Tk_GetRelief.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
@@ -499,6 +603,10 @@ 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
     ln InternAtom.3 Tk_InternAtom.3
@@ -611,9 +719,9 @@ if test -r Name.3; then
     rm -f Tk_NameToWindow.3
     ln Name.3 Tk_NameToWindow.3
 fi
-if test -r ConfigWidg.3; then
+if test -r SetOptions.3; then
     rm -f Tk_Offset.3
-    ln ConfigWidg.3 Tk_Offset.3
+    ln SetOptions.3 Tk_Offset.3
 fi
 if test -r OwnSelect.3; then
     rm -f Tk_OwnSelection.3
@@ -691,6 +799,10 @@ 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
@@ -723,6 +835,10 @@ 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_SetOptions.3
+    ln SetOptions.3 Tk_SetOptions.3
+fi
 if test -r ConfigWind.3; then
     rm -f Tk_SetWindowBackground.3
     ln ConfigWind.3 Tk_SetWindowBackground.3