merged 8.1.0 changes into mainline

1 files changed, 386 insertions, 334 deletions

diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 4e685c5..7daa2a4 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubInit.c,v 1.5 1999/04/16 01:51:22 stanton Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.6 1999/04/24 01:50:50 stanton Exp $
  */
 
 #include "tkInt.h"
@@ -17,6 +17,9 @@
 #ifdef __WIN32__
 #include "tkWinInt.h"
 #endif
+#ifdef MAC_TCL
+#include "tkMacInt.h"
+#endif
 
 #include "tkDecls.h"
 #include "tkPlatDecls.h"
@@ -36,228 +39,6 @@
 
 /* !BEGIN!: Do not edit below this line. */
 
-static TkStubHooks tkStubHooks;
-
-TkStubs tkStubs = {
-    TCL_STUB_MAGIC,
-    &tkStubHooks,
-    Tk_MainLoop, /* 0 */
-    Tk_3DBorderColor, /* 1 */
-    Tk_3DBorderGC, /* 2 */
-    Tk_3DHorizontalBevel, /* 3 */
-    Tk_3DVerticalBevel, /* 4 */
-    Tk_AddOption, /* 5 */
-    Tk_BindEvent, /* 6 */
-    Tk_CanvasDrawableCoords, /* 7 */
-    Tk_CanvasEventuallyRedraw, /* 8 */
-    Tk_CanvasGetCoord, /* 9 */
-    Tk_CanvasGetTextInfo, /* 10 */
-    Tk_CanvasPsBitmap, /* 11 */
-    Tk_CanvasPsColor, /* 12 */
-    Tk_CanvasPsFont, /* 13 */
-    Tk_CanvasPsPath, /* 14 */
-    Tk_CanvasPsStipple, /* 15 */
-    Tk_CanvasPsY, /* 16 */
-    Tk_CanvasSetStippleOrigin, /* 17 */
-    Tk_CanvasTagsParseProc, /* 18 */
-    Tk_CanvasTagsPrintProc, /* 19 */
-    Tk_CanvasTkwin, /* 20 */
-    Tk_CanvasWindowCoords, /* 21 */
-    Tk_ChangeWindowAttributes, /* 22 */
-    Tk_CharBbox, /* 23 */
-    Tk_ClearSelection, /* 24 */
-    Tk_ClipboardAppend, /* 25 */
-    Tk_ClipboardClear, /* 26 */
-    Tk_ConfigureInfo, /* 27 */
-    Tk_ConfigureValue, /* 28 */
-    Tk_ConfigureWidget, /* 29 */
-    Tk_ConfigureWindow, /* 30 */
-    Tk_ComputeTextLayout, /* 31 */
-    Tk_CoordsToWindow, /* 32 */
-    Tk_CreateBinding, /* 33 */
-    Tk_CreateBindingTable, /* 34 */
-    Tk_CreateErrorHandler, /* 35 */
-    Tk_CreateEventHandler, /* 36 */
-    Tk_CreateGenericHandler, /* 37 */
-    Tk_CreateImageType, /* 38 */
-    Tk_CreateItemType, /* 39 */
-    Tk_CreatePhotoImageFormat, /* 40 */
-    Tk_CreateSelHandler, /* 41 */
-    Tk_CreateWindow, /* 42 */
-    Tk_CreateWindowFromPath, /* 43 */
-    Tk_DefineBitmap, /* 44 */
-    Tk_DefineCursor, /* 45 */
-    Tk_DeleteAllBindings, /* 46 */
-    Tk_DeleteBinding, /* 47 */
-    Tk_DeleteBindingTable, /* 48 */
-    Tk_DeleteErrorHandler, /* 49 */
-    Tk_DeleteEventHandler, /* 50 */
-    Tk_DeleteGenericHandler, /* 51 */
-    Tk_DeleteImage, /* 52 */
-    Tk_DeleteSelHandler, /* 53 */
-    Tk_DestroyWindow, /* 54 */
-    Tk_DisplayName, /* 55 */
-    Tk_DistanceToTextLayout, /* 56 */
-    Tk_Draw3DPolygon, /* 57 */
-    Tk_Draw3DRectangle, /* 58 */
-    Tk_DrawChars, /* 59 */
-    Tk_DrawFocusHighlight, /* 60 */
-    Tk_DrawTextLayout, /* 61 */
-    Tk_Fill3DPolygon, /* 62 */
-    Tk_Fill3DRectangle, /* 63 */
-    Tk_FindPhoto, /* 64 */
-    Tk_FontId, /* 65 */
-    Tk_Free3DBorder, /* 66 */
-    Tk_FreeBitmap, /* 67 */
-    Tk_FreeColor, /* 68 */
-    Tk_FreeColormap, /* 69 */
-    Tk_FreeCursor, /* 70 */
-    Tk_FreeFont, /* 71 */
-    Tk_FreeGC, /* 72 */
-    Tk_FreeImage, /* 73 */
-    Tk_FreeOptions, /* 74 */
-    Tk_FreePixmap, /* 75 */
-    Tk_FreeTextLayout, /* 76 */
-    Tk_FreeXId, /* 77 */
-    Tk_GCForColor, /* 78 */
-    Tk_GeometryRequest, /* 79 */
-    Tk_Get3DBorder, /* 80 */
-    Tk_GetAllBindings, /* 81 */
-    Tk_GetAnchor, /* 82 */
-    Tk_GetAtomName, /* 83 */
-    Tk_GetBinding, /* 84 */
-    Tk_GetBitmap, /* 85 */
-    Tk_GetBitmapFromData, /* 86 */
-    Tk_GetCapStyle, /* 87 */
-    Tk_GetColor, /* 88 */
-    Tk_GetColorByValue, /* 89 */
-    Tk_GetColormap, /* 90 */
-    Tk_GetCursor, /* 91 */
-    Tk_GetCursorFromData, /* 92 */
-    Tk_GetFont, /* 93 */
-    Tk_GetFontFromObj, /* 94 */
-    Tk_GetFontMetrics, /* 95 */
-    Tk_GetGC, /* 96 */
-    Tk_GetImage, /* 97 */
-    Tk_GetImageMasterData, /* 98 */
-    Tk_GetItemTypes, /* 99 */
-    Tk_GetJoinStyle, /* 100 */
-    Tk_GetJustify, /* 101 */
-    Tk_GetNumMainWindows, /* 102 */
-    Tk_GetOption, /* 103 */
-    Tk_GetPixels, /* 104 */
-    Tk_GetPixmap, /* 105 */
-    Tk_GetRelief, /* 106 */
-    Tk_GetRootCoords, /* 107 */
-    Tk_GetScrollInfo, /* 108 */
-    Tk_GetScreenMM, /* 109 */
-    Tk_GetSelection, /* 110 */
-    Tk_GetUid, /* 111 */
-    Tk_GetVisual, /* 112 */
-    Tk_GetVRootGeometry, /* 113 */
-    Tk_Grab, /* 114 */
-    Tk_HandleEvent, /* 115 */
-    Tk_IdToWindow, /* 116 */
-    Tk_ImageChanged, /* 117 */
-    Tk_Init, /* 118 */
-    Tk_InternAtom, /* 119 */
-    Tk_IntersectTextLayout, /* 120 */
-    Tk_MaintainGeometry, /* 121 */
-    Tk_MainWindow, /* 122 */
-    Tk_MakeWindowExist, /* 123 */
-    Tk_ManageGeometry, /* 124 */
-    Tk_MapWindow, /* 125 */
-    Tk_MeasureChars, /* 126 */
-    Tk_MoveResizeWindow, /* 127 */
-    Tk_MoveWindow, /* 128 */
-    Tk_MoveToplevelWindow, /* 129 */
-    Tk_NameOf3DBorder, /* 130 */
-    Tk_NameOfAnchor, /* 131 */
-    Tk_NameOfBitmap, /* 132 */
-    Tk_NameOfCapStyle, /* 133 */
-    Tk_NameOfColor, /* 134 */
-    Tk_NameOfCursor, /* 135 */
-    Tk_NameOfFont, /* 136 */
-    Tk_NameOfImage, /* 137 */
-    Tk_NameOfJoinStyle, /* 138 */
-    Tk_NameOfJustify, /* 139 */
-    Tk_NameOfRelief, /* 140 */
-    Tk_NameToWindow, /* 141 */
-    Tk_OwnSelection, /* 142 */
-    Tk_ParseArgv, /* 143 */
-    Tk_PhotoPutBlock, /* 144 */
-    Tk_PhotoPutZoomedBlock, /* 145 */
-    Tk_PhotoGetImage, /* 146 */
-    Tk_PhotoBlank, /* 147 */
-    Tk_PhotoExpand, /* 148 */
-    Tk_PhotoGetSize, /* 149 */
-    Tk_PhotoSetSize, /* 150 */
-    Tk_PointToChar, /* 151 */
-    Tk_PostscriptFontName, /* 152 */
-    Tk_PreserveColormap, /* 153 */
-    Tk_QueueWindowEvent, /* 154 */
-    Tk_RedrawImage, /* 155 */
-    Tk_ResizeWindow, /* 156 */
-    Tk_RestackWindow, /* 157 */
-    Tk_RestrictEvents, /* 158 */
-    Tk_SafeInit, /* 159 */
-    Tk_SetAppName, /* 160 */
-    Tk_SetBackgroundFromBorder, /* 161 */
-    Tk_SetClass, /* 162 */
-    Tk_SetGrid, /* 163 */
-    Tk_SetInternalBorder, /* 164 */
-    Tk_SetWindowBackground, /* 165 */
-    Tk_SetWindowBackgroundPixmap, /* 166 */
-    Tk_SetWindowBorder, /* 167 */
-    Tk_SetWindowBorderWidth, /* 168 */
-    Tk_SetWindowBorderPixmap, /* 169 */
-    Tk_SetWindowColormap, /* 170 */
-    Tk_SetWindowVisual, /* 171 */
-    Tk_SizeOfBitmap, /* 172 */
-    Tk_SizeOfImage, /* 173 */
-    Tk_StrictMotif, /* 174 */
-    Tk_TextLayoutToPostscript, /* 175 */
-    Tk_TextWidth, /* 176 */
-    Tk_UndefineCursor, /* 177 */
-    Tk_UnderlineChars, /* 178 */
-    Tk_UnderlineTextLayout, /* 179 */
-    Tk_Ungrab, /* 180 */
-    Tk_UnmaintainGeometry, /* 181 */
-    Tk_UnmapWindow, /* 182 */
-    Tk_UnsetGrid, /* 183 */
-    Tk_UpdatePointer, /* 184 */
-    Tk_AllocBitmapFromObj, /* 185 */
-    Tk_Alloc3DBorderFromObj, /* 186 */
-    Tk_AllocColorFromObj, /* 187 */
-    Tk_AllocCursorFromObj, /* 188 */
-    Tk_AllocFontFromObj, /* 189 */
-    Tk_CreateOptionTable, /* 190 */
-    Tk_DeleteOptionTable, /* 191 */
-    Tk_Free3DBorderFromObj, /* 192 */
-    Tk_FreeBitmapFromObj, /* 193 */
-    Tk_FreeColorFromObj, /* 194 */
-    Tk_FreeConfigOptions, /* 195 */
-    Tk_FreeSavedOptions, /* 196 */
-    Tk_FreeCursorFromObj, /* 197 */
-    Tk_FreeFontFromObj, /* 198 */
-    Tk_Get3DBorderFromObj, /* 199 */
-    Tk_GetAnchorFromObj, /* 200 */
-    Tk_GetBitmapFromObj, /* 201 */
-    Tk_GetColorFromObj, /* 202 */
-    Tk_GetCursorFromObj, /* 203 */
-    Tk_GetOptionInfo, /* 204 */
-    Tk_GetOptionValue, /* 205 */
-    Tk_GetJustifyFromObj, /* 206 */
-    Tk_GetMMFromObj, /* 207 */
-    Tk_GetPixelsFromObj, /* 208 */
-    Tk_GetReliefFromObj, /* 209 */
-    Tk_GetScrollInfoObj, /* 210 */
-    Tk_InitOptions, /* 211 */
-    Tk_MainEx, /* 212 */
-    Tk_RestoreSavedOptions, /* 213 */
-    Tk_SetOptions, /* 214 */
-};
-
 TkIntStubs tkIntStubs = {
     TCL_STUB_MAGIC,
     NULL,
@@ -374,6 +155,69 @@ TkIntStubs tkIntStubs = {
     TkpGetSubFonts, /* 110 */
     TkpGetSystemDefault, /* 111 */
     TkpMenuThreadInit, /* 112 */
+#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+    NULL, /* 113 */
+#endif /* UNIX */
+#ifdef __WIN32__
+    TkClipBox, /* 113 */
+#endif /* __WIN32__ */
+#ifdef MAC_TCL
+    TkClipBox, /* 113 */
+#endif /* MAC_TCL */
+#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+    NULL, /* 114 */
+#endif /* UNIX */
+#ifdef __WIN32__
+    TkCreateRegion, /* 114 */
+#endif /* __WIN32__ */
+#ifdef MAC_TCL
+    TkCreateRegion, /* 114 */
+#endif /* MAC_TCL */
+#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+    NULL, /* 115 */
+#endif /* UNIX */
+#ifdef __WIN32__
+    TkDestroyRegion, /* 115 */
+#endif /* __WIN32__ */
+#ifdef MAC_TCL
+    TkDestroyRegion, /* 115 */
+#endif /* MAC_TCL */
+#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+    NULL, /* 116 */
+#endif /* UNIX */
+#ifdef __WIN32__
+    TkIntersectRegion, /* 116 */
+#endif /* __WIN32__ */
+#ifdef MAC_TCL
+    TkIntersectRegion, /* 116 */
+#endif /* MAC_TCL */
+#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+    NULL, /* 117 */
+#endif /* UNIX */
+#ifdef __WIN32__
+    TkRectInRegion, /* 117 */
+#endif /* __WIN32__ */
+#ifdef MAC_TCL
+    TkRectInRegion, /* 117 */
+#endif /* MAC_TCL */
+#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+    NULL, /* 118 */
+#endif /* UNIX */
+#ifdef __WIN32__
+    TkSetRegion, /* 118 */
+#endif /* __WIN32__ */
+#ifdef MAC_TCL
+    TkSetRegion, /* 118 */
+#endif /* MAC_TCL */
+#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+    NULL, /* 119 */
+#endif /* UNIX */
+#ifdef __WIN32__
+    TkUnionRectWithRegion, /* 119 */
+#endif /* __WIN32__ */
+#ifdef MAC_TCL
+    TkUnionRectWithRegion, /* 119 */
+#endif /* MAC_TCL */
 };
 
 TkIntPlatStubs tkIntPlatStubs = {
@@ -391,119 +235,106 @@ TkIntPlatStubs tkIntPlatStubs = {
 #endif /* UNIX */
 #ifdef __WIN32__
     TkAlignImageData, /* 0 */
-    TkClipBox, /* 1 */
-    TkCreateRegion, /* 2 */
-    TkDestroyRegion, /* 3 */
-    TkGenerateActivateEvents, /* 4 */
-    TkIntersectRegion, /* 5 */
-    TkpGetMS, /* 6 */
-    TkPointerDeadWindow, /* 7 */
-    TkpPrintWindowId, /* 8 */
-    TkpScanWindowId, /* 9 */
-    TkpSetCapture, /* 10 */
-    TkpSetCursor, /* 11 */
-    TkpWmSetState, /* 12 */
-    TkRectInRegion, /* 13 */
-    TkSetPixmapColormap, /* 14 */
-    TkSetRegion, /* 15 */
-    TkUnionRectWithRegion, /* 16 */
-    TkWinCancelMouseTimer, /* 17 */
-    TkWinClipboardRender, /* 18 */
-    TkWinEmbeddedEventProc, /* 19 */
-    TkWinFillRect, /* 20 */
-    TkWinGetBorderPixels, /* 21 */
-    TkWinGetDrawableDC, /* 22 */
-    TkWinGetModifierState, /* 23 */
-    TkWinGetSystemPalette, /* 24 */
-    TkWinGetWrapperWindow, /* 25 */
-    TkWinHandleMenuEvent, /* 26 */
-    TkWinIndexOfColor, /* 27 */
-    TkWinReleaseDrawableDC, /* 28 */
-    TkWinResendEvent, /* 29 */
-    TkWinSelectPalette, /* 30 */
-    TkWinSetMenu, /* 31 */
-    TkWinSetWindowPos, /* 32 */
-    TkWinWmCleanup, /* 33 */
-    TkWinXCleanup, /* 34 */
-    TkWinXInit, /* 35 */
-    TkWinSetForegroundWindow, /* 36 */
-    TkWinDialogDebug, /* 37 */
-    TkWinGetMenuSystemDefault, /* 38 */
-    TkWinGetPlatformId, /* 39 */
+    NULL, /* 1 */
+    TkGenerateActivateEvents, /* 2 */
+    TkpGetMS, /* 3 */
+    TkPointerDeadWindow, /* 4 */
+    TkpPrintWindowId, /* 5 */
+    TkpScanWindowId, /* 6 */
+    TkpSetCapture, /* 7 */
+    TkpSetCursor, /* 8 */
+    TkpWmSetState, /* 9 */
+    TkSetPixmapColormap, /* 10 */
+    TkWinCancelMouseTimer, /* 11 */
+    TkWinClipboardRender, /* 12 */
+    TkWinEmbeddedEventProc, /* 13 */
+    TkWinFillRect, /* 14 */
+    TkWinGetBorderPixels, /* 15 */
+    TkWinGetDrawableDC, /* 16 */
+    TkWinGetModifierState, /* 17 */
+    TkWinGetSystemPalette, /* 18 */
+    TkWinGetWrapperWindow, /* 19 */
+    TkWinHandleMenuEvent, /* 20 */
+    TkWinIndexOfColor, /* 21 */
+    TkWinReleaseDrawableDC, /* 22 */
+    TkWinResendEvent, /* 23 */
+    TkWinSelectPalette, /* 24 */
+    TkWinSetMenu, /* 25 */
+    TkWinSetWindowPos, /* 26 */
+    TkWinWmCleanup, /* 27 */
+    TkWinXCleanup, /* 28 */
+    TkWinXInit, /* 29 */
+    TkWinSetForegroundWindow, /* 30 */
+    TkWinDialogDebug, /* 31 */
+    TkWinGetMenuSystemDefault, /* 32 */
+    TkWinGetPlatformId, /* 33 */
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
-    TkClipBox, /* 0 */
-    TkCreateRegion, /* 1 */
-    TkDestroyRegion, /* 2 */
-    TkGenerateActivateEvents, /* 3 */
-    TkIntersectRegion, /* 4 */
-    TkpCreateNativeBitmap, /* 5 */
-    TkpDefineNativeBitmaps, /* 6 */
-    TkpGetMS, /* 7 */
-    TkpGetNativeAppBitmap, /* 8 */
-    TkPointerDeadWindow, /* 9 */
-    TkpSetCapture, /* 10 */
-    TkpSetCursor, /* 11 */
-    TkpWmSetState, /* 12 */
-    TkRectInRegion, /* 13 */
-    TkSetRegion, /* 14 */
-    TkUnionRectWithRegion, /* 15 */
-    HandleWMEvent, /* 16 */
-    TkAboutDlg, /* 17 */
-    TkCreateMacEventSource, /* 18 */
-    TkFontList, /* 19 */
-    TkGetTransientMaster, /* 20 */
-    TkGenerateButtonEvent, /* 21 */
-    TkGetCharPositions, /* 22 */
-    TkGenWMDestroyEvent, /* 23 */
-    TkGenWMConfigureEvent, /* 24 */
-    TkMacButtonKeyState, /* 25 */
-    TkMacClearMenubarActive, /* 26 */
-    TkMacConvertEvent, /* 27 */
-    TkMacDispatchMenuEvent, /* 28 */
-    TkMacInstallCursor, /* 29 */
-    TkMacConvertTkEvent, /* 30 */
-    TkMacHandleTearoffMenu, /* 31 */
-    tkMacInstallMWConsole, /* 32 */
-    TkMacInvalClipRgns, /* 33 */
-    TkMacDoHLEvent, /* 34 */
-    TkMacFontInfo, /* 35 */
-    TkMacGenerateTime, /* 36 */
-    TkMacGetDrawablePort, /* 37 */
-    TkMacGetScrollbarGrowWindow, /* 38 */
-    TkMacGetXWindow, /* 39 */
-    TkMacGrowToplevel, /* 40 */
-    TkMacHandleMenuSelect, /* 41 */
-    TkMacHaveAppearance, /* 42 */
-    TkMacInitAppleEvents, /* 43 */
-    TkMacInitMenus, /* 44 */
-    TkMacInvalidateWindow, /* 45 */
-    TkMacIsCharacterMissing, /* 46 */
-    TkMacMakeRealWindowExist, /* 47 */
-    TkMacMakeStippleMap, /* 48 */
-    TkMacMenuClick, /* 49 */
-    TkMacRegisterOffScreenWindow, /* 50 */
-    TkMacResizable, /* 51 */
-    TkMacSetEmbedRgn, /* 52 */
-    TkMacSetHelpMenuItemCount, /* 53 */
-    TkMacSetScrollbarGrow, /* 54 */
-    TkMacSetUpClippingRgn, /* 55 */
-    TkMacSetUpGraphicsPort, /* 56 */
-    TkMacUpdateClipRgn, /* 57 */
-    TkMacUnregisterMacWindow, /* 58 */
-    TkMacUseMenuID, /* 59 */
-    TkMacVisableClipRgn, /* 60 */
-    TkMacWinBounds, /* 61 */
-    TkMacWindowOffset, /* 62 */
-    TkResumeClipboard, /* 63 */
-    TkSetMacColor, /* 64 */
-    TkSetWMName, /* 65 */
-    TkSuspendClipboard, /* 66 */
-    TkWMGrowToplevel, /* 67 */
-    TkMacZoomToplevel, /* 68 */
-    Tk_TopCoordsToWindow, /* 69 */
-    TkMacContainerId, /* 70 */
-    TkMacGetHostToplevel, /* 71 */
+    TkGenerateActivateEvents, /* 0 */
+    TkpCreateNativeBitmap, /* 1 */
+    TkpDefineNativeBitmaps, /* 2 */
+    TkpGetMS, /* 3 */
+    TkpGetNativeAppBitmap, /* 4 */
+    TkPointerDeadWindow, /* 5 */
+    TkpSetCapture, /* 6 */
+    TkpSetCursor, /* 7 */
+    TkpWmSetState, /* 8 */
+    HandleWMEvent, /* 9 */
+    TkAboutDlg, /* 10 */
+    TkCreateMacEventSource, /* 11 */
+    TkFontList, /* 12 */
+    TkGetTransientMaster, /* 13 */
+    TkGenerateButtonEvent, /* 14 */
+    TkGetCharPositions, /* 15 */
+    TkGenWMDestroyEvent, /* 16 */
+    TkGenWMConfigureEvent, /* 17 */
+    TkMacButtonKeyState, /* 18 */
+    TkMacClearMenubarActive, /* 19 */
+    TkMacConvertEvent, /* 20 */
+    TkMacDispatchMenuEvent, /* 21 */
+    TkMacInstallCursor, /* 22 */
+    TkMacConvertTkEvent, /* 23 */
+    TkMacHandleTearoffMenu, /* 24 */
+    tkMacInstallMWConsole, /* 25 */
+    TkMacInvalClipRgns, /* 26 */
+    TkMacDoHLEvent, /* 27 */
+    TkMacFontInfo, /* 28 */
+    TkMacGenerateTime, /* 29 */
+    TkMacGetDrawablePort, /* 30 */
+    TkMacGetScrollbarGrowWindow, /* 31 */
+    TkMacGetXWindow, /* 32 */
+    TkMacGrowToplevel, /* 33 */
+    TkMacHandleMenuSelect, /* 34 */
+    TkMacHaveAppearance, /* 35 */
+    TkMacInitAppleEvents, /* 36 */
+    TkMacInitMenus, /* 37 */
+    TkMacInvalidateWindow, /* 38 */
+    TkMacIsCharacterMissing, /* 39 */
+    TkMacMakeRealWindowExist, /* 40 */
+    TkMacMakeStippleMap, /* 41 */
+    TkMacMenuClick, /* 42 */
+    TkMacRegisterOffScreenWindow, /* 43 */
+    TkMacResizable, /* 44 */
+    TkMacSetEmbedRgn, /* 45 */
+    TkMacSetHelpMenuItemCount, /* 46 */
+    TkMacSetScrollbarGrow, /* 47 */
+    TkMacSetUpClippingRgn, /* 48 */
+    TkMacSetUpGraphicsPort, /* 49 */
+    TkMacUpdateClipRgn, /* 50 */
+    TkMacUnregisterMacWindow, /* 51 */
+    TkMacUseMenuID, /* 52 */
+    TkMacVisableClipRgn, /* 53 */
+    TkMacWinBounds, /* 54 */
+    TkMacWindowOffset, /* 55 */
+    TkResumeClipboard, /* 56 */
+    TkSetMacColor, /* 57 */
+    TkSetWMName, /* 58 */
+    TkSuspendClipboard, /* 59 */
+    TkWMGrowToplevel, /* 60 */
+    TkMacZoomToplevel, /* 61 */
+    Tk_TopCoordsToWindow, /* 62 */
+    TkMacContainerId, /* 63 */
+    TkMacGetHostToplevel, /* 64 */
 #endif /* MAC_TCL */
 };
 
@@ -697,6 +528,8 @@ TkIntXlibStubs tkIntXlibStubs = {
     XGetVisualInfo, /* 77 */
     XSetWMClientMachine, /* 78 */
     XStringListToTextProperty, /* 79 */
+    XDrawSegments, /* 80 */
+    XForceScreenSaver, /* 81 */
 #endif /* MAC_TCL */
 };
 
@@ -733,5 +566,224 @@ static TkStubHooks tkStubHooks = {
     &tkIntXlibStubs
 };
 
+TkStubs tkStubs = {
+    TCL_STUB_MAGIC,
+    &tkStubHooks,
+    Tk_MainLoop, /* 0 */
+    Tk_3DBorderColor, /* 1 */
+    Tk_3DBorderGC, /* 2 */
+    Tk_3DHorizontalBevel, /* 3 */
+    Tk_3DVerticalBevel, /* 4 */
+    Tk_AddOption, /* 5 */
+    Tk_BindEvent, /* 6 */
+    Tk_CanvasDrawableCoords, /* 7 */
+    Tk_CanvasEventuallyRedraw, /* 8 */
+    Tk_CanvasGetCoord, /* 9 */
+    Tk_CanvasGetTextInfo, /* 10 */
+    Tk_CanvasPsBitmap, /* 11 */
+    Tk_CanvasPsColor, /* 12 */
+    Tk_CanvasPsFont, /* 13 */
+    Tk_CanvasPsPath, /* 14 */
+    Tk_CanvasPsStipple, /* 15 */
+    Tk_CanvasPsY, /* 16 */
+    Tk_CanvasSetStippleOrigin, /* 17 */
+    Tk_CanvasTagsParseProc, /* 18 */
+    Tk_CanvasTagsPrintProc, /* 19 */
+    Tk_CanvasTkwin, /* 20 */
+    Tk_CanvasWindowCoords, /* 21 */
+    Tk_ChangeWindowAttributes, /* 22 */
+    Tk_CharBbox, /* 23 */
+    Tk_ClearSelection, /* 24 */
+    Tk_ClipboardAppend, /* 25 */
+    Tk_ClipboardClear, /* 26 */
+    Tk_ConfigureInfo, /* 27 */
+    Tk_ConfigureValue, /* 28 */
+    Tk_ConfigureWidget, /* 29 */
+    Tk_ConfigureWindow, /* 30 */
+    Tk_ComputeTextLayout, /* 31 */
+    Tk_CoordsToWindow, /* 32 */
+    Tk_CreateBinding, /* 33 */
+    Tk_CreateBindingTable, /* 34 */
+    Tk_CreateErrorHandler, /* 35 */
+    Tk_CreateEventHandler, /* 36 */
+    Tk_CreateGenericHandler, /* 37 */
+    Tk_CreateImageType, /* 38 */
+    Tk_CreateItemType, /* 39 */
+    Tk_CreatePhotoImageFormat, /* 40 */
+    Tk_CreateSelHandler, /* 41 */
+    Tk_CreateWindow, /* 42 */
+    Tk_CreateWindowFromPath, /* 43 */
+    Tk_DefineBitmap, /* 44 */
+    Tk_DefineCursor, /* 45 */
+    Tk_DeleteAllBindings, /* 46 */
+    Tk_DeleteBinding, /* 47 */
+    Tk_DeleteBindingTable, /* 48 */
+    Tk_DeleteErrorHandler, /* 49 */
+    Tk_DeleteEventHandler, /* 50 */
+    Tk_DeleteGenericHandler, /* 51 */
+    Tk_DeleteImage, /* 52 */
+    Tk_DeleteSelHandler, /* 53 */
+    Tk_DestroyWindow, /* 54 */
+    Tk_DisplayName, /* 55 */
+    Tk_DistanceToTextLayout, /* 56 */
+    Tk_Draw3DPolygon, /* 57 */
+    Tk_Draw3DRectangle, /* 58 */
+    Tk_DrawChars, /* 59 */
+    Tk_DrawFocusHighlight, /* 60 */
+    Tk_DrawTextLayout, /* 61 */
+    Tk_Fill3DPolygon, /* 62 */
+    Tk_Fill3DRectangle, /* 63 */
+    Tk_FindPhoto, /* 64 */
+    Tk_FontId, /* 65 */
+    Tk_Free3DBorder, /* 66 */
+    Tk_FreeBitmap, /* 67 */
+    Tk_FreeColor, /* 68 */
+    Tk_FreeColormap, /* 69 */
+    Tk_FreeCursor, /* 70 */
+    Tk_FreeFont, /* 71 */
+    Tk_FreeGC, /* 72 */
+    Tk_FreeImage, /* 73 */
+    Tk_FreeOptions, /* 74 */
+    Tk_FreePixmap, /* 75 */
+    Tk_FreeTextLayout, /* 76 */
+    Tk_FreeXId, /* 77 */
+    Tk_GCForColor, /* 78 */
+    Tk_GeometryRequest, /* 79 */
+    Tk_Get3DBorder, /* 80 */
+    Tk_GetAllBindings, /* 81 */
+    Tk_GetAnchor, /* 82 */
+    Tk_GetAtomName, /* 83 */
+    Tk_GetBinding, /* 84 */
+    Tk_GetBitmap, /* 85 */
+    Tk_GetBitmapFromData, /* 86 */
+    Tk_GetCapStyle, /* 87 */
+    Tk_GetColor, /* 88 */
+    Tk_GetColorByValue, /* 89 */
+    Tk_GetColormap, /* 90 */
+    Tk_GetCursor, /* 91 */
+    Tk_GetCursorFromData, /* 92 */
+    Tk_GetFont, /* 93 */
+    Tk_GetFontFromObj, /* 94 */
+    Tk_GetFontMetrics, /* 95 */
+    Tk_GetGC, /* 96 */
+    Tk_GetImage, /* 97 */
+    Tk_GetImageMasterData, /* 98 */
+    Tk_GetItemTypes, /* 99 */
+    Tk_GetJoinStyle, /* 100 */
+    Tk_GetJustify, /* 101 */
+    Tk_GetNumMainWindows, /* 102 */
+    Tk_GetOption, /* 103 */
+    Tk_GetPixels, /* 104 */
+    Tk_GetPixmap, /* 105 */
+    Tk_GetRelief, /* 106 */
+    Tk_GetRootCoords, /* 107 */
+    Tk_GetScrollInfo, /* 108 */
+    Tk_GetScreenMM, /* 109 */
+    Tk_GetSelection, /* 110 */
+    Tk_GetUid, /* 111 */
+    Tk_GetVisual, /* 112 */
+    Tk_GetVRootGeometry, /* 113 */
+    Tk_Grab, /* 114 */
+    Tk_HandleEvent, /* 115 */
+    Tk_IdToWindow, /* 116 */
+    Tk_ImageChanged, /* 117 */
+    Tk_Init, /* 118 */
+    Tk_InternAtom, /* 119 */
+    Tk_IntersectTextLayout, /* 120 */
+    Tk_MaintainGeometry, /* 121 */
+    Tk_MainWindow, /* 122 */
+    Tk_MakeWindowExist, /* 123 */
+    Tk_ManageGeometry, /* 124 */
+    Tk_MapWindow, /* 125 */
+    Tk_MeasureChars, /* 126 */
+    Tk_MoveResizeWindow, /* 127 */
+    Tk_MoveWindow, /* 128 */
+    Tk_MoveToplevelWindow, /* 129 */
+    Tk_NameOf3DBorder, /* 130 */
+    Tk_NameOfAnchor, /* 131 */
+    Tk_NameOfBitmap, /* 132 */
+    Tk_NameOfCapStyle, /* 133 */
+    Tk_NameOfColor, /* 134 */
+    Tk_NameOfCursor, /* 135 */
+    Tk_NameOfFont, /* 136 */
+    Tk_NameOfImage, /* 137 */
+    Tk_NameOfJoinStyle, /* 138 */
+    Tk_NameOfJustify, /* 139 */
+    Tk_NameOfRelief, /* 140 */
+    Tk_NameToWindow, /* 141 */
+    Tk_OwnSelection, /* 142 */
+    Tk_ParseArgv, /* 143 */
+    Tk_PhotoPutBlock, /* 144 */
+    Tk_PhotoPutZoomedBlock, /* 145 */
+    Tk_PhotoGetImage, /* 146 */
+    Tk_PhotoBlank, /* 147 */
+    Tk_PhotoExpand, /* 148 */
+    Tk_PhotoGetSize, /* 149 */
+    Tk_PhotoSetSize, /* 150 */
+    Tk_PointToChar, /* 151 */
+    Tk_PostscriptFontName, /* 152 */
+    Tk_PreserveColormap, /* 153 */
+    Tk_QueueWindowEvent, /* 154 */
+    Tk_RedrawImage, /* 155 */
+    Tk_ResizeWindow, /* 156 */
+    Tk_RestackWindow, /* 157 */
+    Tk_RestrictEvents, /* 158 */
+    Tk_SafeInit, /* 159 */
+    Tk_SetAppName, /* 160 */
+    Tk_SetBackgroundFromBorder, /* 161 */
+    Tk_SetClass, /* 162 */
+    Tk_SetGrid, /* 163 */
+    Tk_SetInternalBorder, /* 164 */
+    Tk_SetWindowBackground, /* 165 */
+    Tk_SetWindowBackgroundPixmap, /* 166 */
+    Tk_SetWindowBorder, /* 167 */
+    Tk_SetWindowBorderWidth, /* 168 */
+    Tk_SetWindowBorderPixmap, /* 169 */
+    Tk_SetWindowColormap, /* 170 */
+    Tk_SetWindowVisual, /* 171 */
+    Tk_SizeOfBitmap, /* 172 */
+    Tk_SizeOfImage, /* 173 */
+    Tk_StrictMotif, /* 174 */
+    Tk_TextLayoutToPostscript, /* 175 */
+    Tk_TextWidth, /* 176 */
+    Tk_UndefineCursor, /* 177 */
+    Tk_UnderlineChars, /* 178 */
+    Tk_UnderlineTextLayout, /* 179 */
+    Tk_Ungrab, /* 180 */
+    Tk_UnmaintainGeometry, /* 181 */
+    Tk_UnmapWindow, /* 182 */
+    Tk_UnsetGrid, /* 183 */
+    Tk_UpdatePointer, /* 184 */
+    Tk_AllocBitmapFromObj, /* 185 */
+    Tk_Alloc3DBorderFromObj, /* 186 */
+    Tk_AllocColorFromObj, /* 187 */
+    Tk_AllocCursorFromObj, /* 188 */
+    Tk_AllocFontFromObj, /* 189 */
+    Tk_CreateOptionTable, /* 190 */
+    Tk_DeleteOptionTable, /* 191 */
+    Tk_Free3DBorderFromObj, /* 192 */
+    Tk_FreeBitmapFromObj, /* 193 */
+    Tk_FreeColorFromObj, /* 194 */
+    Tk_FreeConfigOptions, /* 195 */
+    Tk_FreeSavedOptions, /* 196 */
+    Tk_FreeCursorFromObj, /* 197 */
+    Tk_FreeFontFromObj, /* 198 */
+    Tk_Get3DBorderFromObj, /* 199 */
+    Tk_GetAnchorFromObj, /* 200 */
+    Tk_GetBitmapFromObj, /* 201 */
+    Tk_GetColorFromObj, /* 202 */
+    Tk_GetCursorFromObj, /* 203 */
+    Tk_GetOptionInfo, /* 204 */
+    Tk_GetOptionValue, /* 205 */
+    Tk_GetJustifyFromObj, /* 206 */
+    Tk_GetMMFromObj, /* 207 */
+    Tk_GetPixelsFromObj, /* 208 */
+    Tk_GetReliefFromObj, /* 209 */
+    Tk_GetScrollInfoObj, /* 210 */
+    Tk_InitOptions, /* 211 */
+    Tk_MainEx, /* 212 */
+    Tk_RestoreSavedOptions, /* 213 */
+    Tk_SetOptions, /* 214 */
+};
 
 /* !END!: Do not edit above this line. */