Stubs changes, now wish works on Windows.

17 files changed, 1317 insertions, 2071 deletions

diff --git a/generic/tk.decls b/generic/tk.decls
index 65bf827..a5d560f 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: tk.decls,v 1.1.2.1 1999/03/06 00:08:01 redman Exp $
+# RCS: @(#) $Id: tk.decls,v 1.1.2.2 1999/03/07 00:15:43 redman Exp $
 
 library tk
 
@@ -608,290 +608,285 @@ declare 120 generic {
 	    int width, int height)
 }
 
-# !!!!!! Tk_Main or TkMain?
 declare 121 generic {
-    void Tk_Main (int argc, char **argv, Tcl_AppInitProc *appInitProc)
-}
-
-declare 122 generic {
     void Tk_MaintainGeometry (Tk_Window slave, \
 	    Tk_Window master, int x, int y, int width, int height)
 }
 
-declare 123 generic {
+declare 122 generic {
     Tk_Window Tk_MainWindow (Tcl_Interp *interp)
 }
 
-declare 124 generic {
+declare 123 generic {
     void Tk_MakeWindowExist (Tk_Window tkwin)
 }
 
-declare 125 generic {
+declare 124 generic {
     void Tk_ManageGeometry (Tk_Window tkwin, \
 	    Tk_GeomMgr *mgrPtr, ClientData clientData)
 }
 
-declare 126 generic {
+declare 125 generic {
     void Tk_MapWindow (Tk_Window tkwin)
 }
 
-declare 127 generic {
+declare 126 generic {
     int Tk_MeasureChars (Tk_Font tkfont, \
 	    CONST char *source, int maxChars, int maxPixels, \
 	    int flags, int *lengthPtr)
 }
 
-declare 128 generic {
+declare 127 generic {
     void Tk_MoveResizeWindow (Tk_Window tkwin, \
 	    int x, int y, int width, int height)
 }
 
-declare 129 generic {
+declare 128 generic {
     void Tk_MoveWindow (Tk_Window tkwin, int x, int y)
 }
 
-declare 130 generic {
+declare 129 generic {
     void Tk_MoveToplevelWindow (Tk_Window tkwin, int x, int y)
 }
 
-declare 131 generic {
+declare 130 generic {
     char * Tk_NameOf3DBorder (Tk_3DBorder border)
 }
 
-declare 132 generic {
+declare 131 generic {
     char * Tk_NameOfAnchor (Tk_Anchor anchor)
 }
 
-declare 133 generic {
+declare 132 generic {
     char * Tk_NameOfBitmap (Display *display, Pixmap bitmap)
 }
 
-declare 134 generic {
+declare 133 generic {
     char * Tk_NameOfCapStyle (int cap)
 }
 
-declare 135 generic {
+declare 134 generic {
     char * Tk_NameOfColor (XColor *colorPtr)
 }
 
-declare 136 generic {
+declare 135 generic {
     char * Tk_NameOfCursor (Display *display, Tk_Cursor cursor)
 }
 
-declare 137 generic {
+declare 136 generic {
     char * Tk_NameOfFont (Tk_Font font)
 }
 
-declare 138 generic {
+declare 137 generic {
     char * Tk_NameOfImage (Tk_ImageMaster imageMaster)
 }
 
-declare 139 generic {
+declare 138 generic {
     char * Tk_NameOfJoinStyle (int join)
 }
 
-declare 140 generic {
+declare 139 generic {
     char * Tk_NameOfJustify (Tk_Justify justify)
 }
 
-declare 141 generic {
+declare 140 generic {
     char * Tk_NameOfRelief (int relief)
 }
 
-declare 142 generic {
+declare 141 generic {
     Tk_Window Tk_NameToWindow (Tcl_Interp *interp, \
 	    char *pathName, Tk_Window tkwin)
 }
 
-declare 143 generic {
+declare 142 generic {
     void Tk_OwnSelection (Tk_Window tkwin, \
 	    Atom selection, Tk_LostSelProc *proc, \
 	    ClientData clientData)
 }
 
-declare 144 generic {
+declare 143 generic {
     int Tk_ParseArgv (Tcl_Interp *interp, \
 	    Tk_Window tkwin, int *argcPtr, char **argv, \
 	    Tk_ArgvInfo *argTable, int flags)
 }
 
-declare 145 generic {
+declare 144 generic {
     void Tk_PhotoPutBlock (Tk_PhotoHandle handle, \
 	    Tk_PhotoImageBlock *blockPtr, int x, int y, \
 	    int width, int height)
 }
 
-declare 146 generic {
+declare 145 generic {
     void Tk_PhotoPutZoomedBlock (Tk_PhotoHandle handle, \
 	    Tk_PhotoImageBlock *blockPtr, int x, int y, \
 	    int width, int height, int zoomX, int zoomY, \
 	    int subsampleX, int subsampleY)
 }
 
-declare 147 generic {
+declare 146 generic {
     int Tk_PhotoGetImage (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr)
 }
 
-declare 148 generic {
+declare 147 generic {
     void Tk_PhotoBlank (Tk_PhotoHandle handle)
 }
 
-declare 149 generic {
+declare 148 generic {
     void Tk_PhotoExpand (Tk_PhotoHandle handle, int width, int height )
 }
 
-declare 150 generic {
+declare 149 generic {
     void Tk_PhotoGetSize (Tk_PhotoHandle handle, int *widthPtr, int *heightPtr)
 }
 
-declare 151 generic {
+declare 150 generic {
     void Tk_PhotoSetSize (Tk_PhotoHandle handle, int width, int height)
 }
 
-declare 152 generic {
+declare 151 generic {
     int Tk_PointToChar (Tk_TextLayout layout, int x, int y)
 }
 
-declare 153 generic {
+declare 152 generic {
     int Tk_PostscriptFontName (Tk_Font tkfont, Tcl_DString *dsPtr)
 }
 
-declare 154 generic {
+declare 153 generic {
     void Tk_PreserveColormap (Display *display, Colormap colormap)
 }
 
-declare 155 generic {
+declare 154 generic {
     void Tk_QueueWindowEvent (XEvent *eventPtr, Tcl_QueuePosition position)
 }
 
-declare 156 generic {
+declare 155 generic {
     void Tk_RedrawImage (Tk_Image image, int imageX, \
 	    int imageY, int width, int height, \
 	    Drawable drawable, int drawableX, int drawableY)
 }
 
-declare 157 generic {
+declare 156 generic {
     void Tk_ResizeWindow (Tk_Window tkwin, int width, int height)
 }
 
-declare 158 generic {
+declare 157 generic {
     int Tk_RestackWindow (Tk_Window tkwin, int aboveBelow, Tk_Window other)
 }
 
-declare 159 generic {
+declare 158 generic {
     Tk_RestrictProc *Tk_RestrictEvents (Tk_RestrictProc *proc, \
 	    ClientData arg, ClientData *prevArgPtr)
 }
 
-declare 160 generic {
+declare 159 generic {
     int Tk_SafeInit (Tcl_Interp *interp)
 }
 
-declare 161 generic {
+declare 160 generic {
     char * Tk_SetAppName (Tk_Window tkwin, char *name)
 }
 
-declare 162 generic {
+declare 161 generic {
     void Tk_SetBackgroundFromBorder (Tk_Window tkwin, Tk_3DBorder border)
 }
 
-declare 163 generic {
+declare 162 generic {
     void Tk_SetClass (Tk_Window tkwin, char *className)
 }
 
-declare 164 generic {
+declare 163 generic {
     void Tk_SetGrid (Tk_Window tkwin, int reqWidth, int reqHeight, \
 	    int gridWidth, int gridHeight)
 }
 
-declare 165 generic {
+declare 164 generic {
     void Tk_SetInternalBorder (Tk_Window tkwin, int width)
 }
 
-declare 166 generic {
+declare 165 generic {
     void Tk_SetWindowBackground (Tk_Window tkwin, unsigned long pixel)
 }
 
-declare 167 generic {
+declare 166 generic {
     void Tk_SetWindowBackgroundPixmap (Tk_Window tkwin, Pixmap pixmap)
 }
 
-declare 168 generic {
+declare 167 generic {
     void Tk_SetWindowBorder (Tk_Window tkwin, unsigned long pixel)
 }
 
-declare 169 generic {
+declare 168 generic {
     void Tk_SetWindowBorderWidth (Tk_Window tkwin, int width)
 }
 
-declare 170 generic {
+declare 169 generic {
     void Tk_SetWindowBorderPixmap (Tk_Window tkwin, Pixmap pixmap)
 }
 
-declare 171 generic {
+declare 170 generic {
     void Tk_SetWindowColormap (Tk_Window tkwin, Colormap colormap)
 }
 
-declare 172 generic {
+declare 171 generic {
     int Tk_SetWindowVisual (Tk_Window tkwin, Visual *visual, int depth,\
 	    Colormap colormap)
 }
 
-declare 173 generic {
+declare 172 generic {
     void Tk_SizeOfBitmap (Display *display, Pixmap bitmap, int *widthPtr, \
 	    int *heightPtr)
 }
 
-declare 174 generic {
+declare 173 generic {
     void Tk_SizeOfImage (Tk_Image image, int *widthPtr, int *heightPtr)
 }
 
-declare 175 generic {
+declare 174 generic {
     int Tk_StrictMotif (Tk_Window tkwin)
 }
 
-declare 176 generic {
+declare 175 generic {
     void Tk_TextLayoutToPostscript (Tcl_Interp *interp, Tk_TextLayout layout)
 }
 
-declare 177 generic {
+declare 176 generic {
     int Tk_TextWidth (Tk_Font font, CONST char *string, int numChars)
 }
 
-declare 178 generic {
+declare 177 generic {
     void Tk_UndefineCursor (Tk_Window window)
 }
 
-declare 179 generic {
+declare 178 generic {
     void Tk_UnderlineChars (Display *display, \
 	    Drawable drawable, GC gc, Tk_Font tkfont, \
 	    CONST char *source, int x, int y, int firstChar, \
 	    int lastChar)
 }
 
-declare 180 generic {
+declare 179 generic {
     void Tk_UnderlineTextLayout (Display *display, Drawable drawable, GC gc, \
 	    Tk_TextLayout layout, int x, int y, \
 	    int underline)
 }
 
-declare 181 generic {
+declare 180 generic {
     void Tk_Ungrab (Tk_Window tkwin)
 }
 
-declare 182 generic {
+declare 181 generic {
     void Tk_UnmaintainGeometry (Tk_Window slave, Tk_Window master)
 }
 
-declare 183 generic {
+declare 182 generic {
     void Tk_UnmapWindow (Tk_Window tkwin)
 }
 
-declare 184 generic {
+declare 183 generic {
     void Tk_UnsetGrid (Tk_Window tkwin)
 }
 
-declare 185 generic {
+declare 184 generic {
     void Tk_UpdatePointer (Tk_Window tkwin, int x, int y, int state)
 }
 
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index 6f89c48..d1532ac 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -10,10 +10,11 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkConsole.c,v 1.3.4.1 1999/03/06 23:18:05 stanton Exp $
+ * RCS: @(#) $Id: tkConsole.c,v 1.3.4.2 1999/03/07 00:15:43 redman Exp $
  */
 
 #include "tk.h"
+#include "tkInt.h"
 #include <string.h>
 
 /*
@@ -167,6 +168,7 @@ TkConsoleInit(interp)
 #endif
     
     consoleInterp = Tcl_CreateInterp();
+    
     if (consoleInterp == NULL) {
 	goto error;
     }
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 25520da..3f1e9b9 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -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: tkDecls.h,v 1.1.2.1 1999/03/06 00:08:02 redman Exp $
+ * RCS: @(#) $Id: tkDecls.h,v 1.1.2.2 1999/03/07 00:15:43 redman Exp $
  */
 
 #ifndef _TKDECLS
@@ -445,198 +445,195 @@ EXTERN int		Tk_IntersectTextLayout _ANSI_ARGS_((
 				Tk_TextLayout layout, int x, int y, 
 				int width, int height));
 /* 121 */
-EXTERN void		Tk_Main _ANSI_ARGS_((int argc, char ** argv, 
-				Tcl_AppInitProc * appInitProc));
-/* 122 */
 EXTERN void		Tk_MaintainGeometry _ANSI_ARGS_((Tk_Window slave, 
 				Tk_Window master, int x, int y, int width, 
 				int height));
-/* 123 */
+/* 122 */
 EXTERN Tk_Window	Tk_MainWindow _ANSI_ARGS_((Tcl_Interp * interp));
-/* 124 */
+/* 123 */
 EXTERN void		Tk_MakeWindowExist _ANSI_ARGS_((Tk_Window tkwin));
-/* 125 */
+/* 124 */
 EXTERN void		Tk_ManageGeometry _ANSI_ARGS_((Tk_Window tkwin, 
 				Tk_GeomMgr * mgrPtr, ClientData clientData));
-/* 126 */
+/* 125 */
 EXTERN void		Tk_MapWindow _ANSI_ARGS_((Tk_Window tkwin));
-/* 127 */
+/* 126 */
 EXTERN int		Tk_MeasureChars _ANSI_ARGS_((Tk_Font tkfont, 
 				CONST char * source, int maxChars, 
 				int maxPixels, int flags, int * lengthPtr));
-/* 128 */
+/* 127 */
 EXTERN void		Tk_MoveResizeWindow _ANSI_ARGS_((Tk_Window tkwin, 
 				int x, int y, int width, int height));
-/* 129 */
+/* 128 */
 EXTERN void		Tk_MoveWindow _ANSI_ARGS_((Tk_Window tkwin, int x, 
 				int y));
-/* 130 */
+/* 129 */
 EXTERN void		Tk_MoveToplevelWindow _ANSI_ARGS_((Tk_Window tkwin, 
 				int x, int y));
-/* 131 */
+/* 130 */
 EXTERN char *		Tk_NameOf3DBorder _ANSI_ARGS_((Tk_3DBorder border));
-/* 132 */
+/* 131 */
 EXTERN char *		Tk_NameOfAnchor _ANSI_ARGS_((Tk_Anchor anchor));
-/* 133 */
+/* 132 */
 EXTERN char *		Tk_NameOfBitmap _ANSI_ARGS_((Display * display, 
 				Pixmap bitmap));
-/* 134 */
+/* 133 */
 EXTERN char *		Tk_NameOfCapStyle _ANSI_ARGS_((int cap));
-/* 135 */
+/* 134 */
 EXTERN char *		Tk_NameOfColor _ANSI_ARGS_((XColor * colorPtr));
-/* 136 */
+/* 135 */
 EXTERN char *		Tk_NameOfCursor _ANSI_ARGS_((Display * display, 
 				Tk_Cursor cursor));
-/* 137 */
+/* 136 */
 EXTERN char *		Tk_NameOfFont _ANSI_ARGS_((Tk_Font font));
-/* 138 */
+/* 137 */
 EXTERN char *		Tk_NameOfImage _ANSI_ARGS_((
 				Tk_ImageMaster imageMaster));
-/* 139 */
+/* 138 */
 EXTERN char *		Tk_NameOfJoinStyle _ANSI_ARGS_((int join));
-/* 140 */
+/* 139 */
 EXTERN char *		Tk_NameOfJustify _ANSI_ARGS_((Tk_Justify justify));
-/* 141 */
+/* 140 */
 EXTERN char *		Tk_NameOfRelief _ANSI_ARGS_((int relief));
-/* 142 */
+/* 141 */
 EXTERN Tk_Window	Tk_NameToWindow _ANSI_ARGS_((Tcl_Interp * interp, 
 				char * pathName, Tk_Window tkwin));
-/* 143 */
+/* 142 */
 EXTERN void		Tk_OwnSelection _ANSI_ARGS_((Tk_Window tkwin, 
 				Atom selection, Tk_LostSelProc * proc, 
 				ClientData clientData));
-/* 144 */
+/* 143 */
 EXTERN int		Tk_ParseArgv _ANSI_ARGS_((Tcl_Interp * interp, 
 				Tk_Window tkwin, int * argcPtr, char ** argv, 
 				Tk_ArgvInfo * argTable, int flags));
-/* 145 */
+/* 144 */
 EXTERN void		Tk_PhotoPutBlock _ANSI_ARGS_((Tk_PhotoHandle handle, 
 				Tk_PhotoImageBlock * blockPtr, int x, int y, 
 				int width, int height));
-/* 146 */
+/* 145 */
 EXTERN void		Tk_PhotoPutZoomedBlock _ANSI_ARGS_((
 				Tk_PhotoHandle handle, 
 				Tk_PhotoImageBlock * blockPtr, int x, int y, 
 				int width, int height, int zoomX, int zoomY, 
 				int subsampleX, int subsampleY));
-/* 147 */
+/* 146 */
 EXTERN int		Tk_PhotoGetImage _ANSI_ARGS_((Tk_PhotoHandle handle, 
 				Tk_PhotoImageBlock * blockPtr));
-/* 148 */
+/* 147 */
 EXTERN void		Tk_PhotoBlank _ANSI_ARGS_((Tk_PhotoHandle handle));
-/* 149 */
+/* 148 */
 EXTERN void		Tk_PhotoExpand _ANSI_ARGS_((Tk_PhotoHandle handle, 
 				int width, int height));
-/* 150 */
+/* 149 */
 EXTERN void		Tk_PhotoGetSize _ANSI_ARGS_((Tk_PhotoHandle handle, 
 				int * widthPtr, int * heightPtr));
-/* 151 */
+/* 150 */
 EXTERN void		Tk_PhotoSetSize _ANSI_ARGS_((Tk_PhotoHandle handle, 
 				int width, int height));
-/* 152 */
+/* 151 */
 EXTERN int		Tk_PointToChar _ANSI_ARGS_((Tk_TextLayout layout, 
 				int x, int y));
-/* 153 */
+/* 152 */
 EXTERN int		Tk_PostscriptFontName _ANSI_ARGS_((Tk_Font tkfont, 
 				Tcl_DString * dsPtr));
-/* 154 */
+/* 153 */
 EXTERN void		Tk_PreserveColormap _ANSI_ARGS_((Display * display, 
 				Colormap colormap));
-/* 155 */
+/* 154 */
 EXTERN void		Tk_QueueWindowEvent _ANSI_ARGS_((XEvent * eventPtr, 
 				Tcl_QueuePosition position));
-/* 156 */
+/* 155 */
 EXTERN void		Tk_RedrawImage _ANSI_ARGS_((Tk_Image image, 
 				int imageX, int imageY, int width, 
 				int height, Drawable drawable, int drawableX, 
 				int drawableY));
-/* 157 */
+/* 156 */
 EXTERN void		Tk_ResizeWindow _ANSI_ARGS_((Tk_Window tkwin, 
 				int width, int height));
-/* 158 */
+/* 157 */
 EXTERN int		Tk_RestackWindow _ANSI_ARGS_((Tk_Window tkwin, 
 				int aboveBelow, Tk_Window other));
-/* 159 */
+/* 158 */
 EXTERN Tk_RestrictProc * Tk_RestrictEvents _ANSI_ARGS_((
 				Tk_RestrictProc * proc, ClientData arg, 
 				ClientData * prevArgPtr));
-/* 160 */
+/* 159 */
 EXTERN int		Tk_SafeInit _ANSI_ARGS_((Tcl_Interp * interp));
-/* 161 */
+/* 160 */
 EXTERN char *		Tk_SetAppName _ANSI_ARGS_((Tk_Window tkwin, 
 				char * name));
-/* 162 */
+/* 161 */
 EXTERN void		Tk_SetBackgroundFromBorder _ANSI_ARGS_((
 				Tk_Window tkwin, Tk_3DBorder border));
-/* 163 */
+/* 162 */
 EXTERN void		Tk_SetClass _ANSI_ARGS_((Tk_Window tkwin, 
 				char * className));
-/* 164 */
+/* 163 */
 EXTERN void		Tk_SetGrid _ANSI_ARGS_((Tk_Window tkwin, 
 				int reqWidth, int reqHeight, int gridWidth, 
 				int gridHeight));
-/* 165 */
+/* 164 */
 EXTERN void		Tk_SetInternalBorder _ANSI_ARGS_((Tk_Window tkwin, 
 				int width));
-/* 166 */
+/* 165 */
 EXTERN void		Tk_SetWindowBackground _ANSI_ARGS_((Tk_Window tkwin, 
 				unsigned long pixel));
-/* 167 */
+/* 166 */
 EXTERN void		Tk_SetWindowBackgroundPixmap _ANSI_ARGS_((
 				Tk_Window tkwin, Pixmap pixmap));
-/* 168 */
+/* 167 */
 EXTERN void		Tk_SetWindowBorder _ANSI_ARGS_((Tk_Window tkwin, 
 				unsigned long pixel));
-/* 169 */
+/* 168 */
 EXTERN void		Tk_SetWindowBorderWidth _ANSI_ARGS_((Tk_Window tkwin, 
 				int width));
-/* 170 */
+/* 169 */
 EXTERN void		Tk_SetWindowBorderPixmap _ANSI_ARGS_((
 				Tk_Window tkwin, Pixmap pixmap));
-/* 171 */
+/* 170 */
 EXTERN void		Tk_SetWindowColormap _ANSI_ARGS_((Tk_Window tkwin, 
 				Colormap colormap));
-/* 172 */
+/* 171 */
 EXTERN int		Tk_SetWindowVisual _ANSI_ARGS_((Tk_Window tkwin, 
 				Visual * visual, int depth, 
 				Colormap colormap));
-/* 173 */
+/* 172 */
 EXTERN void		Tk_SizeOfBitmap _ANSI_ARGS_((Display * display, 
 				Pixmap bitmap, int * widthPtr, 
 				int * heightPtr));
-/* 174 */
+/* 173 */
 EXTERN void		Tk_SizeOfImage _ANSI_ARGS_((Tk_Image image, 
 				int * widthPtr, int * heightPtr));
-/* 175 */
+/* 174 */
 EXTERN int		Tk_StrictMotif _ANSI_ARGS_((Tk_Window tkwin));
-/* 176 */
+/* 175 */
 EXTERN void		Tk_TextLayoutToPostscript _ANSI_ARGS_((
 				Tcl_Interp * interp, Tk_TextLayout layout));
-/* 177 */
+/* 176 */
 EXTERN int		Tk_TextWidth _ANSI_ARGS_((Tk_Font font, 
 				CONST char * string, int numChars));
-/* 178 */
+/* 177 */
 EXTERN void		Tk_UndefineCursor _ANSI_ARGS_((Tk_Window window));
-/* 179 */
+/* 178 */
 EXTERN void		Tk_UnderlineChars _ANSI_ARGS_((Display * display, 
 				Drawable drawable, GC gc, Tk_Font tkfont, 
 				CONST char * source, int x, int y, 
 				int firstChar, int lastChar));
-/* 180 */
+/* 179 */
 EXTERN void		Tk_UnderlineTextLayout _ANSI_ARGS_((
 				Display * display, Drawable drawable, GC gc, 
 				Tk_TextLayout layout, int x, int y, 
 				int underline));
-/* 181 */
+/* 180 */
 EXTERN void		Tk_Ungrab _ANSI_ARGS_((Tk_Window tkwin));
-/* 182 */
+/* 181 */
 EXTERN void		Tk_UnmaintainGeometry _ANSI_ARGS_((Tk_Window slave, 
 				Tk_Window master));
-/* 183 */
+/* 182 */
 EXTERN void		Tk_UnmapWindow _ANSI_ARGS_((Tk_Window tkwin));
-/* 184 */
+/* 183 */
 EXTERN void		Tk_UnsetGrid _ANSI_ARGS_((Tk_Window tkwin));
-/* 185 */
+/* 184 */
 EXTERN void		Tk_UpdatePointer _ANSI_ARGS_((Tk_Window tkwin, int x, 
 				int y, int state));
 
@@ -772,71 +769,70 @@ typedef struct TkStubs {
     int (*tk_Init) _ANSI_ARGS_((Tcl_Interp * interp)); /* 118 */
     Atom (*tk_InternAtom) _ANSI_ARGS_((Tk_Window tkwin, char * name)); /* 119 */
     int (*tk_IntersectTextLayout) _ANSI_ARGS_((Tk_TextLayout layout, int x, int y, int width, int height)); /* 120 */
-    void (*tk_Main) _ANSI_ARGS_((int argc, char ** argv, Tcl_AppInitProc * appInitProc)); /* 121 */
-    void (*tk_MaintainGeometry) _ANSI_ARGS_((Tk_Window slave, Tk_Window master, int x, int y, int width, int height)); /* 122 */
-    Tk_Window (*tk_MainWindow) _ANSI_ARGS_((Tcl_Interp * interp)); /* 123 */
-    void (*tk_MakeWindowExist) _ANSI_ARGS_((Tk_Window tkwin)); /* 124 */
-    void (*tk_ManageGeometry) _ANSI_ARGS_((Tk_Window tkwin, Tk_GeomMgr * mgrPtr, ClientData clientData)); /* 125 */
-    void (*tk_MapWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 126 */
-    int (*tk_MeasureChars) _ANSI_ARGS_((Tk_Font tkfont, CONST char * source, int maxChars, int maxPixels, int flags, int * lengthPtr)); /* 127 */
-    void (*tk_MoveResizeWindow) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height)); /* 128 */
-    void (*tk_MoveWindow) _ANSI_ARGS_((Tk_Window tkwin, int x, int y)); /* 129 */
-    void (*tk_MoveToplevelWindow) _ANSI_ARGS_((Tk_Window tkwin, int x, int y)); /* 130 */
-    char * (*tk_NameOf3DBorder) _ANSI_ARGS_((Tk_3DBorder border)); /* 131 */
-    char * (*tk_NameOfAnchor) _ANSI_ARGS_((Tk_Anchor anchor)); /* 132 */
-    char * (*tk_NameOfBitmap) _ANSI_ARGS_((Display * display, Pixmap bitmap)); /* 133 */
-    char * (*tk_NameOfCapStyle) _ANSI_ARGS_((int cap)); /* 134 */
-    char * (*tk_NameOfColor) _ANSI_ARGS_((XColor * colorPtr)); /* 135 */
-    char * (*tk_NameOfCursor) _ANSI_ARGS_((Display * display, Tk_Cursor cursor)); /* 136 */
-    char * (*tk_NameOfFont) _ANSI_ARGS_((Tk_Font font)); /* 137 */
-    char * (*tk_NameOfImage) _ANSI_ARGS_((Tk_ImageMaster imageMaster)); /* 138 */
-    char * (*tk_NameOfJoinStyle) _ANSI_ARGS_((int join)); /* 139 */
-    char * (*tk_NameOfJustify) _ANSI_ARGS_((Tk_Justify justify)); /* 140 */
-    char * (*tk_NameOfRelief) _ANSI_ARGS_((int relief)); /* 141 */
-    Tk_Window (*tk_NameToWindow) _ANSI_ARGS_((Tcl_Interp * interp, char * pathName, Tk_Window tkwin)); /* 142 */
-    void (*tk_OwnSelection) _ANSI_ARGS_((Tk_Window tkwin, Atom selection, Tk_LostSelProc * proc, ClientData clientData)); /* 143 */
-    int (*tk_ParseArgv) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, int * argcPtr, char ** argv, Tk_ArgvInfo * argTable, int flags)); /* 144 */
-    void (*tk_PhotoPutBlock) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height)); /* 145 */
-    void (*tk_PhotoPutZoomedBlock) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY)); /* 146 */
-    int (*tk_PhotoGetImage) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr)); /* 147 */
-    void (*tk_PhotoBlank) _ANSI_ARGS_((Tk_PhotoHandle handle)); /* 148 */
-    void (*tk_PhotoExpand) _ANSI_ARGS_((Tk_PhotoHandle handle, int width, int height)); /* 149 */
-    void (*tk_PhotoGetSize) _ANSI_ARGS_((Tk_PhotoHandle handle, int * widthPtr, int * heightPtr)); /* 150 */
-    void (*tk_PhotoSetSize) _ANSI_ARGS_((Tk_PhotoHandle handle, int width, int height)); /* 151 */
-    int (*tk_PointToChar) _ANSI_ARGS_((Tk_TextLayout layout, int x, int y)); /* 152 */
-    int (*tk_PostscriptFontName) _ANSI_ARGS_((Tk_Font tkfont, Tcl_DString * dsPtr)); /* 153 */
-    void (*tk_PreserveColormap) _ANSI_ARGS_((Display * display, Colormap colormap)); /* 154 */
-    void (*tk_QueueWindowEvent) _ANSI_ARGS_((XEvent * eventPtr, Tcl_QueuePosition position)); /* 155 */
-    void (*tk_RedrawImage) _ANSI_ARGS_((Tk_Image image, int imageX, int imageY, int width, int height, Drawable drawable, int drawableX, int drawableY)); /* 156 */
-    void (*tk_ResizeWindow) _ANSI_ARGS_((Tk_Window tkwin, int width, int height)); /* 157 */
-    int (*tk_RestackWindow) _ANSI_ARGS_((Tk_Window tkwin, int aboveBelow, Tk_Window other)); /* 158 */
-    Tk_RestrictProc * (*tk_RestrictEvents) _ANSI_ARGS_((Tk_RestrictProc * proc, ClientData arg, ClientData * prevArgPtr)); /* 159 */
-    int (*tk_SafeInit) _ANSI_ARGS_((Tcl_Interp * interp)); /* 160 */
-    char * (*tk_SetAppName) _ANSI_ARGS_((Tk_Window tkwin, char * name)); /* 161 */
-    void (*tk_SetBackgroundFromBorder) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border)); /* 162 */
-    void (*tk_SetClass) _ANSI_ARGS_((Tk_Window tkwin, char * className)); /* 163 */
-    void (*tk_SetGrid) _ANSI_ARGS_((Tk_Window tkwin, int reqWidth, int reqHeight, int gridWidth, int gridHeight)); /* 164 */
-    void (*tk_SetInternalBorder) _ANSI_ARGS_((Tk_Window tkwin, int width)); /* 165 */
-    void (*tk_SetWindowBackground) _ANSI_ARGS_((Tk_Window tkwin, unsigned long pixel)); /* 166 */
-    void (*tk_SetWindowBackgroundPixmap) _ANSI_ARGS_((Tk_Window tkwin, Pixmap pixmap)); /* 167 */
-    void (*tk_SetWindowBorder) _ANSI_ARGS_((Tk_Window tkwin, unsigned long pixel)); /* 168 */
-    void (*tk_SetWindowBorderWidth) _ANSI_ARGS_((Tk_Window tkwin, int width)); /* 169 */
-    void (*tk_SetWindowBorderPixmap) _ANSI_ARGS_((Tk_Window tkwin, Pixmap pixmap)); /* 170 */
-    void (*tk_SetWindowColormap) _ANSI_ARGS_((Tk_Window tkwin, Colormap colormap)); /* 171 */
-    int (*tk_SetWindowVisual) _ANSI_ARGS_((Tk_Window tkwin, Visual * visual, int depth, Colormap colormap)); /* 172 */
-    void (*tk_SizeOfBitmap) _ANSI_ARGS_((Display * display, Pixmap bitmap, int * widthPtr, int * heightPtr)); /* 173 */
-    void (*tk_SizeOfImage) _ANSI_ARGS_((Tk_Image image, int * widthPtr, int * heightPtr)); /* 174 */
-    int (*tk_StrictMotif) _ANSI_ARGS_((Tk_Window tkwin)); /* 175 */
-    void (*tk_TextLayoutToPostscript) _ANSI_ARGS_((Tcl_Interp * interp, Tk_TextLayout layout)); /* 176 */
-    int (*tk_TextWidth) _ANSI_ARGS_((Tk_Font font, CONST char * string, int numChars)); /* 177 */
-    void (*tk_UndefineCursor) _ANSI_ARGS_((Tk_Window window)); /* 178 */
-    void (*tk_UnderlineChars) _ANSI_ARGS_((Display * display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char * source, int x, int y, int firstChar, int lastChar)); /* 179 */
-    void (*tk_UnderlineTextLayout) _ANSI_ARGS_((Display * display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline)); /* 180 */
-    void (*tk_Ungrab) _ANSI_ARGS_((Tk_Window tkwin)); /* 181 */
-    void (*tk_UnmaintainGeometry) _ANSI_ARGS_((Tk_Window slave, Tk_Window master)); /* 182 */
-    void (*tk_UnmapWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 183 */
-    void (*tk_UnsetGrid) _ANSI_ARGS_((Tk_Window tkwin)); /* 184 */
-    void (*tk_UpdatePointer) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int state)); /* 185 */
+    void (*tk_MaintainGeometry) _ANSI_ARGS_((Tk_Window slave, Tk_Window master, int x, int y, int width, int height)); /* 121 */
+    Tk_Window (*tk_MainWindow) _ANSI_ARGS_((Tcl_Interp * interp)); /* 122 */
+    void (*tk_MakeWindowExist) _ANSI_ARGS_((Tk_Window tkwin)); /* 123 */
+    void (*tk_ManageGeometry) _ANSI_ARGS_((Tk_Window tkwin, Tk_GeomMgr * mgrPtr, ClientData clientData)); /* 124 */
+    void (*tk_MapWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 125 */
+    int (*tk_MeasureChars) _ANSI_ARGS_((Tk_Font tkfont, CONST char * source, int maxChars, int maxPixels, int flags, int * lengthPtr)); /* 126 */
+    void (*tk_MoveResizeWindow) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height)); /* 127 */
+    void (*tk_MoveWindow) _ANSI_ARGS_((Tk_Window tkwin, int x, int y)); /* 128 */
+    void (*tk_MoveToplevelWindow) _ANSI_ARGS_((Tk_Window tkwin, int x, int y)); /* 129 */
+    char * (*tk_NameOf3DBorder) _ANSI_ARGS_((Tk_3DBorder border)); /* 130 */
+    char * (*tk_NameOfAnchor) _ANSI_ARGS_((Tk_Anchor anchor)); /* 131 */
+    char * (*tk_NameOfBitmap) _ANSI_ARGS_((Display * display, Pixmap bitmap)); /* 132 */
+    char * (*tk_NameOfCapStyle) _ANSI_ARGS_((int cap)); /* 133 */
+    char * (*tk_NameOfColor) _ANSI_ARGS_((XColor * colorPtr)); /* 134 */
+    char * (*tk_NameOfCursor) _ANSI_ARGS_((Display * display, Tk_Cursor cursor)); /* 135 */
+    char * (*tk_NameOfFont) _ANSI_ARGS_((Tk_Font font)); /* 136 */
+    char * (*tk_NameOfImage) _ANSI_ARGS_((Tk_ImageMaster imageMaster)); /* 137 */
+    char * (*tk_NameOfJoinStyle) _ANSI_ARGS_((int join)); /* 138 */
+    char * (*tk_NameOfJustify) _ANSI_ARGS_((Tk_Justify justify)); /* 139 */
+    char * (*tk_NameOfRelief) _ANSI_ARGS_((int relief)); /* 140 */
+    Tk_Window (*tk_NameToWindow) _ANSI_ARGS_((Tcl_Interp * interp, char * pathName, Tk_Window tkwin)); /* 141 */
+    void (*tk_OwnSelection) _ANSI_ARGS_((Tk_Window tkwin, Atom selection, Tk_LostSelProc * proc, ClientData clientData)); /* 142 */
+    int (*tk_ParseArgv) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, int * argcPtr, char ** argv, Tk_ArgvInfo * argTable, int flags)); /* 143 */
+    void (*tk_PhotoPutBlock) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height)); /* 144 */
+    void (*tk_PhotoPutZoomedBlock) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY)); /* 145 */
+    int (*tk_PhotoGetImage) _ANSI_ARGS_((Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr)); /* 146 */
+    void (*tk_PhotoBlank) _ANSI_ARGS_((Tk_PhotoHandle handle)); /* 147 */
+    void (*tk_PhotoExpand) _ANSI_ARGS_((Tk_PhotoHandle handle, int width, int height)); /* 148 */
+    void (*tk_PhotoGetSize) _ANSI_ARGS_((Tk_PhotoHandle handle, int * widthPtr, int * heightPtr)); /* 149 */
+    void (*tk_PhotoSetSize) _ANSI_ARGS_((Tk_PhotoHandle handle, int width, int height)); /* 150 */
+    int (*tk_PointToChar) _ANSI_ARGS_((Tk_TextLayout layout, int x, int y)); /* 151 */
+    int (*tk_PostscriptFontName) _ANSI_ARGS_((Tk_Font tkfont, Tcl_DString * dsPtr)); /* 152 */
+    void (*tk_PreserveColormap) _ANSI_ARGS_((Display * display, Colormap colormap)); /* 153 */
+    void (*tk_QueueWindowEvent) _ANSI_ARGS_((XEvent * eventPtr, Tcl_QueuePosition position)); /* 154 */
+    void (*tk_RedrawImage) _ANSI_ARGS_((Tk_Image image, int imageX, int imageY, int width, int height, Drawable drawable, int drawableX, int drawableY)); /* 155 */
+    void (*tk_ResizeWindow) _ANSI_ARGS_((Tk_Window tkwin, int width, int height)); /* 156 */
+    int (*tk_RestackWindow) _ANSI_ARGS_((Tk_Window tkwin, int aboveBelow, Tk_Window other)); /* 157 */
+    Tk_RestrictProc * (*tk_RestrictEvents) _ANSI_ARGS_((Tk_RestrictProc * proc, ClientData arg, ClientData * prevArgPtr)); /* 158 */
+    int (*tk_SafeInit) _ANSI_ARGS_((Tcl_Interp * interp)); /* 159 */
+    char * (*tk_SetAppName) _ANSI_ARGS_((Tk_Window tkwin, char * name)); /* 160 */
+    void (*tk_SetBackgroundFromBorder) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border)); /* 161 */
+    void (*tk_SetClass) _ANSI_ARGS_((Tk_Window tkwin, char * className)); /* 162 */
+    void (*tk_SetGrid) _ANSI_ARGS_((Tk_Window tkwin, int reqWidth, int reqHeight, int gridWidth, int gridHeight)); /* 163 */
+    void (*tk_SetInternalBorder) _ANSI_ARGS_((Tk_Window tkwin, int width)); /* 164 */
+    void (*tk_SetWindowBackground) _ANSI_ARGS_((Tk_Window tkwin, unsigned long pixel)); /* 165 */
+    void (*tk_SetWindowBackgroundPixmap) _ANSI_ARGS_((Tk_Window tkwin, Pixmap pixmap)); /* 166 */
+    void (*tk_SetWindowBorder) _ANSI_ARGS_((Tk_Window tkwin, unsigned long pixel)); /* 167 */
+    void (*tk_SetWindowBorderWidth) _ANSI_ARGS_((Tk_Window tkwin, int width)); /* 168 */
+    void (*tk_SetWindowBorderPixmap) _ANSI_ARGS_((Tk_Window tkwin, Pixmap pixmap)); /* 169 */
+    void (*tk_SetWindowColormap) _ANSI_ARGS_((Tk_Window tkwin, Colormap colormap)); /* 170 */
+    int (*tk_SetWindowVisual) _ANSI_ARGS_((Tk_Window tkwin, Visual * visual, int depth, Colormap colormap)); /* 171 */
+    void (*tk_SizeOfBitmap) _ANSI_ARGS_((Display * display, Pixmap bitmap, int * widthPtr, int * heightPtr)); /* 172 */
+    void (*tk_SizeOfImage) _ANSI_ARGS_((Tk_Image image, int * widthPtr, int * heightPtr)); /* 173 */
+    int (*tk_StrictMotif) _ANSI_ARGS_((Tk_Window tkwin)); /* 174 */
+    void (*tk_TextLayoutToPostscript) _ANSI_ARGS_((Tcl_Interp * interp, Tk_TextLayout layout)); /* 175 */
+    int (*tk_TextWidth) _ANSI_ARGS_((Tk_Font font, CONST char * string, int numChars)); /* 176 */
+    void (*tk_UndefineCursor) _ANSI_ARGS_((Tk_Window window)); /* 177 */
+    void (*tk_UnderlineChars) _ANSI_ARGS_((Display * display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char * source, int x, int y, int firstChar, int lastChar)); /* 178 */
+    void (*tk_UnderlineTextLayout) _ANSI_ARGS_((Display * display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline)); /* 179 */
+    void (*tk_Ungrab) _ANSI_ARGS_((Tk_Window tkwin)); /* 180 */
+    void (*tk_UnmaintainGeometry) _ANSI_ARGS_((Tk_Window slave, Tk_Window master)); /* 181 */
+    void (*tk_UnmapWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 182 */
+    void (*tk_UnsetGrid) _ANSI_ARGS_((Tk_Window tkwin)); /* 183 */
+    void (*tk_UpdatePointer) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int state)); /* 184 */
 } TkStubs;
 
 extern TkStubs *tkStubsPtr;
@@ -1331,265 +1327,261 @@ extern TkStubs *tkStubsPtr;
 #define Tk_IntersectTextLayout(layout, x, y, width, height) \
 	(tkStubsPtr->tk_IntersectTextLayout)(layout, x, y, width, height) /* 120 */
 #endif
-#ifndef Tk_Main
-#define Tk_Main(argc, argv, appInitProc) \
-	(tkStubsPtr->tk_Main)(argc, argv, appInitProc) /* 121 */
-#endif
 #ifndef Tk_MaintainGeometry
 #define Tk_MaintainGeometry(slave, master, x, y, width, height) \
-	(tkStubsPtr->tk_MaintainGeometry)(slave, master, x, y, width, height) /* 122 */
+	(tkStubsPtr->tk_MaintainGeometry)(slave, master, x, y, width, height) /* 121 */
 #endif
 #ifndef Tk_MainWindow
 #define Tk_MainWindow(interp) \
-	(tkStubsPtr->tk_MainWindow)(interp) /* 123 */
+	(tkStubsPtr->tk_MainWindow)(interp) /* 122 */
 #endif
 #ifndef Tk_MakeWindowExist
 #define Tk_MakeWindowExist(tkwin) \
-	(tkStubsPtr->tk_MakeWindowExist)(tkwin) /* 124 */
+	(tkStubsPtr->tk_MakeWindowExist)(tkwin) /* 123 */
 #endif
 #ifndef Tk_ManageGeometry
 #define Tk_ManageGeometry(tkwin, mgrPtr, clientData) \
-	(tkStubsPtr->tk_ManageGeometry)(tkwin, mgrPtr, clientData) /* 125 */
+	(tkStubsPtr->tk_ManageGeometry)(tkwin, mgrPtr, clientData) /* 124 */
 #endif
 #ifndef Tk_MapWindow
 #define Tk_MapWindow(tkwin) \
-	(tkStubsPtr->tk_MapWindow)(tkwin) /* 126 */
+	(tkStubsPtr->tk_MapWindow)(tkwin) /* 125 */
 #endif
 #ifndef Tk_MeasureChars
 #define Tk_MeasureChars(tkfont, source, maxChars, maxPixels, flags, lengthPtr) \
-	(tkStubsPtr->tk_MeasureChars)(tkfont, source, maxChars, maxPixels, flags, lengthPtr) /* 127 */
+	(tkStubsPtr->tk_MeasureChars)(tkfont, source, maxChars, maxPixels, flags, lengthPtr) /* 126 */
 #endif
 #ifndef Tk_MoveResizeWindow
 #define Tk_MoveResizeWindow(tkwin, x, y, width, height) \
-	(tkStubsPtr->tk_MoveResizeWindow)(tkwin, x, y, width, height) /* 128 */
+	(tkStubsPtr->tk_MoveResizeWindow)(tkwin, x, y, width, height) /* 127 */
 #endif
 #ifndef Tk_MoveWindow
 #define Tk_MoveWindow(tkwin, x, y) \
-	(tkStubsPtr->tk_MoveWindow)(tkwin, x, y) /* 129 */
+	(tkStubsPtr->tk_MoveWindow)(tkwin, x, y) /* 128 */
 #endif
 #ifndef Tk_MoveToplevelWindow
 #define Tk_MoveToplevelWindow(tkwin, x, y) \
-	(tkStubsPtr->tk_MoveToplevelWindow)(tkwin, x, y) /* 130 */
+	(tkStubsPtr->tk_MoveToplevelWindow)(tkwin, x, y) /* 129 */
 #endif
 #ifndef Tk_NameOf3DBorder
 #define Tk_NameOf3DBorder(border) \
-	(tkStubsPtr->tk_NameOf3DBorder)(border) /* 131 */
+	(tkStubsPtr->tk_NameOf3DBorder)(border) /* 130 */
 #endif
 #ifndef Tk_NameOfAnchor
 #define Tk_NameOfAnchor(anchor) \
-	(tkStubsPtr->tk_NameOfAnchor)(anchor) /* 132 */
+	(tkStubsPtr->tk_NameOfAnchor)(anchor) /* 131 */
 #endif
 #ifndef Tk_NameOfBitmap
 #define Tk_NameOfBitmap(display, bitmap) \
-	(tkStubsPtr->tk_NameOfBitmap)(display, bitmap) /* 133 */
+	(tkStubsPtr->tk_NameOfBitmap)(display, bitmap) /* 132 */
 #endif
 #ifndef Tk_NameOfCapStyle
 #define Tk_NameOfCapStyle(cap) \
-	(tkStubsPtr->tk_NameOfCapStyle)(cap) /* 134 */
+	(tkStubsPtr->tk_NameOfCapStyle)(cap) /* 133 */
 #endif
 #ifndef Tk_NameOfColor
 #define Tk_NameOfColor(colorPtr) \
-	(tkStubsPtr->tk_NameOfColor)(colorPtr) /* 135 */
+	(tkStubsPtr->tk_NameOfColor)(colorPtr) /* 134 */
 #endif
 #ifndef Tk_NameOfCursor
 #define Tk_NameOfCursor(display, cursor) \
-	(tkStubsPtr->tk_NameOfCursor)(display, cursor) /* 136 */
+	(tkStubsPtr->tk_NameOfCursor)(display, cursor) /* 135 */
 #endif
 #ifndef Tk_NameOfFont
 #define Tk_NameOfFont(font) \
-	(tkStubsPtr->tk_NameOfFont)(font) /* 137 */
+	(tkStubsPtr->tk_NameOfFont)(font) /* 136 */
 #endif
 #ifndef Tk_NameOfImage
 #define Tk_NameOfImage(imageMaster) \
-	(tkStubsPtr->tk_NameOfImage)(imageMaster) /* 138 */
+	(tkStubsPtr->tk_NameOfImage)(imageMaster) /* 137 */
 #endif
 #ifndef Tk_NameOfJoinStyle
 #define Tk_NameOfJoinStyle(join) \
-	(tkStubsPtr->tk_NameOfJoinStyle)(join) /* 139 */
+	(tkStubsPtr->tk_NameOfJoinStyle)(join) /* 138 */
 #endif
 #ifndef Tk_NameOfJustify
 #define Tk_NameOfJustify(justify) \
-	(tkStubsPtr->tk_NameOfJustify)(justify) /* 140 */
+	(tkStubsPtr->tk_NameOfJustify)(justify) /* 139 */
 #endif
 #ifndef Tk_NameOfRelief
 #define Tk_NameOfRelief(relief) \
-	(tkStubsPtr->tk_NameOfRelief)(relief) /* 141 */
+	(tkStubsPtr->tk_NameOfRelief)(relief) /* 140 */
 #endif
 #ifndef Tk_NameToWindow
 #define Tk_NameToWindow(interp, pathName, tkwin) \
-	(tkStubsPtr->tk_NameToWindow)(interp, pathName, tkwin) /* 142 */
+	(tkStubsPtr->tk_NameToWindow)(interp, pathName, tkwin) /* 141 */
 #endif
 #ifndef Tk_OwnSelection
 #define Tk_OwnSelection(tkwin, selection, proc, clientData) \
-	(tkStubsPtr->tk_OwnSelection)(tkwin, selection, proc, clientData) /* 143 */
+	(tkStubsPtr->tk_OwnSelection)(tkwin, selection, proc, clientData) /* 142 */
 #endif
 #ifndef Tk_ParseArgv
 #define Tk_ParseArgv(interp, tkwin, argcPtr, argv, argTable, flags) \
-	(tkStubsPtr->tk_ParseArgv)(interp, tkwin, argcPtr, argv, argTable, flags) /* 144 */
+	(tkStubsPtr->tk_ParseArgv)(interp, tkwin, argcPtr, argv, argTable, flags) /* 143 */
 #endif
 #ifndef Tk_PhotoPutBlock
 #define Tk_PhotoPutBlock(handle, blockPtr, x, y, width, height) \
-	(tkStubsPtr->tk_PhotoPutBlock)(handle, blockPtr, x, y, width, height) /* 145 */
+	(tkStubsPtr->tk_PhotoPutBlock)(handle, blockPtr, x, y, width, height) /* 144 */
 #endif
 #ifndef Tk_PhotoPutZoomedBlock
 #define Tk_PhotoPutZoomedBlock(handle, blockPtr, x, y, width, height, zoomX, zoomY, subsampleX, subsampleY) \
-	(tkStubsPtr->tk_PhotoPutZoomedBlock)(handle, blockPtr, x, y, width, height, zoomX, zoomY, subsampleX, subsampleY) /* 146 */
+	(tkStubsPtr->tk_PhotoPutZoomedBlock)(handle, blockPtr, x, y, width, height, zoomX, zoomY, subsampleX, subsampleY) /* 145 */
 #endif
 #ifndef Tk_PhotoGetImage
 #define Tk_PhotoGetImage(handle, blockPtr) \
-	(tkStubsPtr->tk_PhotoGetImage)(handle, blockPtr) /* 147 */
+	(tkStubsPtr->tk_PhotoGetImage)(handle, blockPtr) /* 146 */
 #endif
 #ifndef Tk_PhotoBlank
 #define Tk_PhotoBlank(handle) \
-	(tkStubsPtr->tk_PhotoBlank)(handle) /* 148 */
+	(tkStubsPtr->tk_PhotoBlank)(handle) /* 147 */
 #endif
 #ifndef Tk_PhotoExpand
 #define Tk_PhotoExpand(handle, width, height) \
-	(tkStubsPtr->tk_PhotoExpand)(handle, width, height) /* 149 */
+	(tkStubsPtr->tk_PhotoExpand)(handle, width, height) /* 148 */
 #endif
 #ifndef Tk_PhotoGetSize
 #define Tk_PhotoGetSize(handle, widthPtr, heightPtr) \
-	(tkStubsPtr->tk_PhotoGetSize)(handle, widthPtr, heightPtr) /* 150 */
+	(tkStubsPtr->tk_PhotoGetSize)(handle, widthPtr, heightPtr) /* 149 */
 #endif
 #ifndef Tk_PhotoSetSize
 #define Tk_PhotoSetSize(handle, width, height) \
-	(tkStubsPtr->tk_PhotoSetSize)(handle, width, height) /* 151 */
+	(tkStubsPtr->tk_PhotoSetSize)(handle, width, height) /* 150 */
 #endif
 #ifndef Tk_PointToChar
 #define Tk_PointToChar(layout, x, y) \
-	(tkStubsPtr->tk_PointToChar)(layout, x, y) /* 152 */
+	(tkStubsPtr->tk_PointToChar)(layout, x, y) /* 151 */
 #endif
 #ifndef Tk_PostscriptFontName
 #define Tk_PostscriptFontName(tkfont, dsPtr) \
-	(tkStubsPtr->tk_PostscriptFontName)(tkfont, dsPtr) /* 153 */
+	(tkStubsPtr->tk_PostscriptFontName)(tkfont, dsPtr) /* 152 */
 #endif
 #ifndef Tk_PreserveColormap
 #define Tk_PreserveColormap(display, colormap) \
-	(tkStubsPtr->tk_PreserveColormap)(display, colormap) /* 154 */
+	(tkStubsPtr->tk_PreserveColormap)(display, colormap) /* 153 */
 #endif
 #ifndef Tk_QueueWindowEvent
 #define Tk_QueueWindowEvent(eventPtr, position) \
-	(tkStubsPtr->tk_QueueWindowEvent)(eventPtr, position) /* 155 */
+	(tkStubsPtr->tk_QueueWindowEvent)(eventPtr, position) /* 154 */
 #endif
 #ifndef Tk_RedrawImage
 #define Tk_RedrawImage(image, imageX, imageY, width, height, drawable, drawableX, drawableY) \
-	(tkStubsPtr->tk_RedrawImage)(image, imageX, imageY, width, height, drawable, drawableX, drawableY) /* 156 */
+	(tkStubsPtr->tk_RedrawImage)(image, imageX, imageY, width, height, drawable, drawableX, drawableY) /* 155 */
 #endif
 #ifndef Tk_ResizeWindow
 #define Tk_ResizeWindow(tkwin, width, height) \
-	(tkStubsPtr->tk_ResizeWindow)(tkwin, width, height) /* 157 */
+	(tkStubsPtr->tk_ResizeWindow)(tkwin, width, height) /* 156 */
 #endif
 #ifndef Tk_RestackWindow
 #define Tk_RestackWindow(tkwin, aboveBelow, other) \
-	(tkStubsPtr->tk_RestackWindow)(tkwin, aboveBelow, other) /* 158 */
+	(tkStubsPtr->tk_RestackWindow)(tkwin, aboveBelow, other) /* 157 */
 #endif
 #ifndef Tk_RestrictEvents
 #define Tk_RestrictEvents(proc, arg, prevArgPtr) \
-	(tkStubsPtr->tk_RestrictEvents)(proc, arg, prevArgPtr) /* 159 */
+	(tkStubsPtr->tk_RestrictEvents)(proc, arg, prevArgPtr) /* 158 */
 #endif
 #ifndef Tk_SafeInit
 #define Tk_SafeInit(interp) \
-	(tkStubsPtr->tk_SafeInit)(interp) /* 160 */
+	(tkStubsPtr->tk_SafeInit)(interp) /* 159 */
 #endif
 #ifndef Tk_SetAppName
 #define Tk_SetAppName(tkwin, name) \
-	(tkStubsPtr->tk_SetAppName)(tkwin, name) /* 161 */
+	(tkStubsPtr->tk_SetAppName)(tkwin, name) /* 160 */
 #endif
 #ifndef Tk_SetBackgroundFromBorder
 #define Tk_SetBackgroundFromBorder(tkwin, border) \
-	(tkStubsPtr->tk_SetBackgroundFromBorder)(tkwin, border) /* 162 */
+	(tkStubsPtr->tk_SetBackgroundFromBorder)(tkwin, border) /* 161 */
 #endif
 #ifndef Tk_SetClass
 #define Tk_SetClass(tkwin, className) \
-	(tkStubsPtr->tk_SetClass)(tkwin, className) /* 163 */
+	(tkStubsPtr->tk_SetClass)(tkwin, className) /* 162 */
 #endif
 #ifndef Tk_SetGrid
 #define Tk_SetGrid(tkwin, reqWidth, reqHeight, gridWidth, gridHeight) \
-	(tkStubsPtr->tk_SetGrid)(tkwin, reqWidth, reqHeight, gridWidth, gridHeight) /* 164 */
+	(tkStubsPtr->tk_SetGrid)(tkwin, reqWidth, reqHeight, gridWidth, gridHeight) /* 163 */
 #endif
 #ifndef Tk_SetInternalBorder
 #define Tk_SetInternalBorder(tkwin, width) \
-	(tkStubsPtr->tk_SetInternalBorder)(tkwin, width) /* 165 */
+	(tkStubsPtr->tk_SetInternalBorder)(tkwin, width) /* 164 */
 #endif
 #ifndef Tk_SetWindowBackground
 #define Tk_SetWindowBackground(tkwin, pixel) \
-	(tkStubsPtr->tk_SetWindowBackground)(tkwin, pixel) /* 166 */
+	(tkStubsPtr->tk_SetWindowBackground)(tkwin, pixel) /* 165 */
 #endif
 #ifndef Tk_SetWindowBackgroundPixmap
 #define Tk_SetWindowBackgroundPixmap(tkwin, pixmap) \
-	(tkStubsPtr->tk_SetWindowBackgroundPixmap)(tkwin, pixmap) /* 167 */
+	(tkStubsPtr->tk_SetWindowBackgroundPixmap)(tkwin, pixmap) /* 166 */
 #endif
 #ifndef Tk_SetWindowBorder
 #define Tk_SetWindowBorder(tkwin, pixel) \
-	(tkStubsPtr->tk_SetWindowBorder)(tkwin, pixel) /* 168 */
+	(tkStubsPtr->tk_SetWindowBorder)(tkwin, pixel) /* 167 */
 #endif
 #ifndef Tk_SetWindowBorderWidth
 #define Tk_SetWindowBorderWidth(tkwin, width) \
-	(tkStubsPtr->tk_SetWindowBorderWidth)(tkwin, width) /* 169 */
+	(tkStubsPtr->tk_SetWindowBorderWidth)(tkwin, width) /* 168 */
 #endif
 #ifndef Tk_SetWindowBorderPixmap
 #define Tk_SetWindowBorderPixmap(tkwin, pixmap) \
-	(tkStubsPtr->tk_SetWindowBorderPixmap)(tkwin, pixmap) /* 170 */
+	(tkStubsPtr->tk_SetWindowBorderPixmap)(tkwin, pixmap) /* 169 */
 #endif
 #ifndef Tk_SetWindowColormap
 #define Tk_SetWindowColormap(tkwin, colormap) \
-	(tkStubsPtr->tk_SetWindowColormap)(tkwin, colormap) /* 171 */
+	(tkStubsPtr->tk_SetWindowColormap)(tkwin, colormap) /* 170 */
 #endif
 #ifndef Tk_SetWindowVisual
 #define Tk_SetWindowVisual(tkwin, visual, depth, colormap) \
-	(tkStubsPtr->tk_SetWindowVisual)(tkwin, visual, depth, colormap) /* 172 */
+	(tkStubsPtr->tk_SetWindowVisual)(tkwin, visual, depth, colormap) /* 171 */
 #endif
 #ifndef Tk_SizeOfBitmap
 #define Tk_SizeOfBitmap(display, bitmap, widthPtr, heightPtr) \
-	(tkStubsPtr->tk_SizeOfBitmap)(display, bitmap, widthPtr, heightPtr) /* 173 */
+	(tkStubsPtr->tk_SizeOfBitmap)(display, bitmap, widthPtr, heightPtr) /* 172 */
 #endif
 #ifndef Tk_SizeOfImage
 #define Tk_SizeOfImage(image, widthPtr, heightPtr) \
-	(tkStubsPtr->tk_SizeOfImage)(image, widthPtr, heightPtr) /* 174 */
+	(tkStubsPtr->tk_SizeOfImage)(image, widthPtr, heightPtr) /* 173 */
 #endif
 #ifndef Tk_StrictMotif
 #define Tk_StrictMotif(tkwin) \
-	(tkStubsPtr->tk_StrictMotif)(tkwin) /* 175 */
+	(tkStubsPtr->tk_StrictMotif)(tkwin) /* 174 */
 #endif
 #ifndef Tk_TextLayoutToPostscript
 #define Tk_TextLayoutToPostscript(interp, layout) \
-	(tkStubsPtr->tk_TextLayoutToPostscript)(interp, layout) /* 176 */
+	(tkStubsPtr->tk_TextLayoutToPostscript)(interp, layout) /* 175 */
 #endif
 #ifndef Tk_TextWidth
 #define Tk_TextWidth(font, string, numChars) \
-	(tkStubsPtr->tk_TextWidth)(font, string, numChars) /* 177 */
+	(tkStubsPtr->tk_TextWidth)(font, string, numChars) /* 176 */
 #endif
 #ifndef Tk_UndefineCursor
 #define Tk_UndefineCursor(window) \
-	(tkStubsPtr->tk_UndefineCursor)(window) /* 178 */
+	(tkStubsPtr->tk_UndefineCursor)(window) /* 177 */
 #endif
 #ifndef Tk_UnderlineChars
 #define Tk_UnderlineChars(display, drawable, gc, tkfont, source, x, y, firstChar, lastChar) \
-	(tkStubsPtr->tk_UnderlineChars)(display, drawable, gc, tkfont, source, x, y, firstChar, lastChar) /* 179 */
+	(tkStubsPtr->tk_UnderlineChars)(display, drawable, gc, tkfont, source, x, y, firstChar, lastChar) /* 178 */
 #endif
 #ifndef Tk_UnderlineTextLayout
 #define Tk_UnderlineTextLayout(display, drawable, gc, layout, x, y, underline) \
-	(tkStubsPtr->tk_UnderlineTextLayout)(display, drawable, gc, layout, x, y, underline) /* 180 */
+	(tkStubsPtr->tk_UnderlineTextLayout)(display, drawable, gc, layout, x, y, underline) /* 179 */
 #endif
 #ifndef Tk_Ungrab
 #define Tk_Ungrab(tkwin) \
-	(tkStubsPtr->tk_Ungrab)(tkwin) /* 181 */
+	(tkStubsPtr->tk_Ungrab)(tkwin) /* 180 */
 #endif
 #ifndef Tk_UnmaintainGeometry
 #define Tk_UnmaintainGeometry(slave, master) \
-	(tkStubsPtr->tk_UnmaintainGeometry)(slave, master) /* 182 */
+	(tkStubsPtr->tk_UnmaintainGeometry)(slave, master) /* 181 */
 #endif
 #ifndef Tk_UnmapWindow
 #define Tk_UnmapWindow(tkwin) \
-	(tkStubsPtr->tk_UnmapWindow)(tkwin) /* 183 */
+	(tkStubsPtr->tk_UnmapWindow)(tkwin) /* 182 */
 #endif
 #ifndef Tk_UnsetGrid
 #define Tk_UnsetGrid(tkwin) \
-	(tkStubsPtr->tk_UnsetGrid)(tkwin) /* 184 */
+	(tkStubsPtr->tk_UnsetGrid)(tkwin) /* 183 */
 #endif
 #ifndef Tk_UpdatePointer
 #define Tk_UpdatePointer(tkwin, x, y, state) \
-	(tkStubsPtr->tk_UpdatePointer)(tkwin, x, y, state) /* 185 */
+	(tkStubsPtr->tk_UpdatePointer)(tkwin, x, y, state) /* 184 */
 #endif
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 6225529..3530ea3 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: tkInt.decls,v 1.1.2.2 1999/03/06 01:54:58 redman Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.1.2.3 1999/03/07 00:15:43 redman Exp $
 
 library tk
 
@@ -544,143 +544,114 @@ declare 9 win {
     int TkpScanWindowId (Tcl_Interp *interp, char *string, int *idPtr)
 }
 
-declare 11 win {
+declare 10 win {
     void TkpSetCapture (TkWindow *winPtr)
 }
 
-declare 12 win {
+declare 11 win {
     void TkpSetCursor (TkpCursor cursor)
 }
 
-declare 13 win {
+declare 12 win {
     void TkpWmSetState (TkWindow *winPtr, int state)
 }
 
-declare 14 win {
+declare 13 win {
     int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, \
 	    unsigned int height)
 }
 
-declare 15 win {
+declare 14 win {
     void TkSetPixmapColormap (Pixmap pixmap, Colormap colormap)
 }
 
-declare 16 win {
+declare 15 win {
     void TkSetRegion (Display* display, GC gc, TkRegion rgn)
 }
 
-declare 17 win {
+declare 16 win {
     void TkUnionRectWithRegion (XRectangle* rect, \
 	    TkRegion src, TkRegion dr_return)
 }
 
-declare 18 win {
+declare 17 win {
     void  TkWinCancelMouseTimer (void)
 }
 
-declare 20 win {
+declare 18 win {
     void  TkWinClipboardRender (TkDisplay *dispPtr, UINT format)
 }
 
-declare 21 win {
+declare 19 win {
     LRESULT  TkWinEmbeddedEventProc (HWND hwnd, UINT message, \
 	    WPARAM wParam, LPARAM lParam)
 }
 
-declare 22 win {
+declare 20 win {
     void  TkWinFillRect (HDC dc, int x, int y, int width, int height, \
 	    int pixel)
 }
 
-declare 23 win {
+declare 21 win {
     COLORREF  TkWinGetBorderPixels (Tk_Window tkwin, Tk_3DBorder border, \
 	    int which)
 }
 
-declare 24 win {
+declare 22 win {
     HDC  TkWinGetDrawableDC (Display *display, Drawable d, TkWinDCState* state)
 }
 
-declare 25 win {
+declare 23 win {
     int  TkWinGetModifierState (void)
 }
 
-declare 26 win {
+declare 24 win {
     HPALETTE  TkWinGetSystemPalette (void)
 }
 
-declare 27 win {
+declare 25 win {
     HWND  TkWinGetWrapperWindow (Tk_Window tkwin)
 }
 
-declare 28 win {
+declare 26 win {
     int  TkWinHandleMenuEvent (HWND *phwnd, \
 	    UINT *pMessage, WPARAM *pwParam, LPARAM *plParam, \
 	    LRESULT *plResult)
 }
 
-declare 29 win {
+declare 27 win {
     int  TkWinIndexOfColor (XColor *colorPtr)
 }
 
-declare 30 win {
-    void  TkWinPointerDeadWindow (TkWindow *winPtr)
-}
-
-declare 31 win {
-    void  TkWinPointerEvent (HWND hwnd, int x, int y)
-}
-
-declare 32 win {
-    void  TkWinPointerInit (void)
-}
-
-declare 33 win {
-    LRESULT   TkWinReflectMessage (HWND hwnd, UINT message, \
-	    WPARAM wParam, LPARAM lParam)
-}
-
-declare 34 win {
+declare 28 win {
     void  TkWinReleaseDrawableDC (Drawable d, HDC hdc, TkWinDCState* state)
 }
 
-declare 35 win {
+declare 29 win {
     LRESULT  TkWinResendEvent (WNDPROC wndproc, HWND hwnd, XEvent *eventPtr)
 }
 
-declare 36 win {
+declare 30 win {
     HPALETTE  TkWinSelectPalette (HDC dc, Colormap colormap)
 }
 
-declare 37 win {
+declare 31 win {
     void  TkWinSetMenu (Tk_Window tkwin, HMENU hMenu)
 }
 
-declare 38 win {
+declare 32 win {
     void  TkWinSetWindowPos (HWND hwnd, HWND siblingHwnd, int pos)
 }
 
-declare 39 win {
-    void  TkWinUpdateCursor (TkWindow *winPtr)
-}
-
-declare 40 win {
+declare 33 win {
     void  TkWinWmCleanup (HINSTANCE hInstance)
 }
 
-declare 41 win {
-    HWND  TkWinWmFindEmbedAssociation (TkWindow *winPtr)
-}
-
-declare 42 win {
-    void  TkWinWmStoreEmbedAssociation (TkWindow *winPtr, HWND hwnd)
-}
-
-declare 43 win {
+declare 34 win {
     void  TkWinXCleanup (HINSTANCE hInstance)
 }
 
-declare 44 win {
+declare 35 win {
     void   TkWinXInit (HINSTANCE hInstance)
 }
 
@@ -737,250 +708,250 @@ declare 11 mac {
     void TkpSetCursor (TkpCursor cursor)
 }
 
-declare 13 mac {
+declare 12 mac {
     void TkpWmSetState (TkWindow *winPtr, int state)
 }
 
-declare 14 mac {
+declare 13 mac {
     int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, \
 	    unsigned int height)
 }
 
-declare 15 mac {
+declare 14 mac {
     void TkSetRegion (Display* display, GC gc, TkRegion rgn)
 }
 
-declare 16 mac {
+declare 15 mac {
     void TkUnionRectWithRegion (XRectangle* rect, \
 	    TkRegion src, TkRegion dr_return)
 }
 
-declare 17 mac {
+declare 16 mac {
     int  HandleWMEvent (EventRecord *theEvent)
 }
 
-declare 18 mac {
+declare 17 mac {
     void   TkAboutDlg (void)
 }
 
-declare 19 mac {
+declare 18 mac {
     void  TkCreateMacEventSource (void)
 }
 
-declare 20 mac {
+declare 19 mac {
     void   TkFontList (Tcl_Interp *interp, Display *display)
 }
 
-declare 21 mac {
+declare 20 mac {
     Window  TkGetTransientMaster (TkWindow *winPtr)
 }
 
-declare 22 mac {
+declare 21 mac {
     int  TkGenerateButtonEvent (int x, int y, \
 	    Window window, unsigned int state)
 }
 
-declare 23 mac {
+declare 22 mac {
     int   TkGetCharPositions (XFontStruct *font_struct, char *string, \
 	    int count, short *buffer)
 }
 
-declare 24 mac {
+declare 23 mac {
     void  TkGenWMDestroyEvent (Tk_Window tkwin)
 }
 
-declare 25 mac {
+declare 24 mac {
     void  TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, \
 	    int width, int height, int flags)
 }
 
-declare 26 mac {
+declare 25 mac {
     unsigned int TkMacButtonKeyState (void)
 }
 
-declare 27 mac {
+declare 26 mac {
     void  TkMacClearMenubarActive (void)
 }
 
-declare 28 mac {
+declare 27 mac {
     int  TkMacConvertEvent (EventRecord *eventPtr)
 }
 
-declare 29 mac {
+declare 28 mac {
     int  TkMacDispatchMenuEvent (int menuID, int index)
 }
 
-declare 30 mac {
+declare 29 mac {
     void  TkMacInstallCursor (int resizeOverride)
 }
 
-declare 31 mac {
+declare 30 mac {
     int  TkMacConvertTkEvent (EventRecord *eventPtr, Window window)
 }
 
-declare 32 mac {
+declare 31 mac {
     void  TkMacHandleTearoffMenu (void)
 }
 
-declare 33 mac {
+declare 32 mac {
     void  tkMacInstallMWConsole (Tcl_Interp *interp)
 }
 
-declare 34 mac {
+declare 33 mac {
     void  TkMacInvalClipRgns (TkWindow *winPtr)
 }
 
-declare 35 mac {
+declare 34 mac {
     void  TkMacDoHLEvent (EventRecord *theEvent)
 }
 
-declare 36 mac {
+declare 35 mac {
     void   TkMacFontInfo (Font fontId, short *family, \
 	    short *style, short *size)
 }
 
-declare 37 mac {
+declare 36 mac {
     Time  TkMacGenerateTime (void)
 }
 
-declare 38 mac {
+declare 37 mac {
     GWorldPtr  TkMacGetDrawablePort (Drawable drawable)
 }
 
-declare 39 mac {
+declare 38 mac {
     TkWindow *  TkMacGetScrollbarGrowWindow (TkWindow *winPtr)
 }
 
-declare 40 mac {
+declare 39 mac {
     Window   TkMacGetXWindow (WindowRef macWinPtr)
 }
 
-declare 41 mac {
+declare 40 mac {
     int  TkMacGrowToplevel (WindowRef whichWindow, Point start)
 }
 
-declare 42 mac {
+declare 41 mac {
     void   TkMacHandleMenuSelect (long mResult, int optionKeyPressed)
 }
 
-declare 43 mac {
+declare 42 mac {
     int  TkMacHaveAppearance (void)
 }
 
-declare 44 mac {
+declare 43 mac {
     void  TkMacInitAppleEvents (Tcl_Interp *interp)
 }
 
-declare 45 mac {
+declare 44 mac {
     void   TkMacInitMenus (Tcl_Interp  *interp)
 }
 
-declare 46 mac {
+declare 45 mac {
     void  TkMacInvalidateWindow (MacDrawable *macWin, int flag)
 }
 
-declare 47 mac {
+declare 46 mac {
     int  TkMacIsCharacterMissing (Tk_Font tkfont, unsigned int searchChar)
 }
 
-declare 48 mac {
+declare 47 mac {
     void  TkMacMakeRealWindowExist (TkWindow *winPtr)
 }
 
-declare 49 mac {
+declare 48 mac {
     BitMapPtr TkMacMakeStippleMap(Drawable d1, Drawable d2)
 }
 
-declare 50 mac {
+declare 49 mac {
     void  TkMacMenuClick (void)
 }
 
-declare 51 mac {
+declare 50 mac {
     void  TkMacRegisterOffScreenWindow (Window window, GWorldPtr portPtr)
 }
 
-declare 52 mac {
+declare 51 mac {
     int  TkMacResizable (TkWindow *winPtr)
 }
 
-declare 53 mac {
+declare 52 mac {
     void  TkMacSetEmbedRgn (TkWindow *winPtr, RgnHandle rgn)
 }
 
-declare 54 mac {
+declare 53 mac {
     void  TkMacSetHelpMenuItemCount (void)
 }
 
-declare 55 mac {
+declare 54 mac {
     void  TkMacSetScrollbarGrow (TkWindow *winPtr, int flag)
 }
 
-declare 56 mac {
+declare 55 mac {
     void  TkMacSetUpClippingRgn (Drawable drawable)
 }
 
-declare 57 mac {
+declare 56 mac {
     void  TkMacSetUpGraphicsPort (GC gc)
 }
 
-declare 58 mac {
+declare 57 mac {
     void   TkMacUpdateClipRgn (TkWindow *winPtr)
 }
 
-declare 59 mac {
+declare 58 mac {
     void  TkMacUnregisterMacWindow (GWorldPtr portPtr)
 }
 
-declare 60 mac {
+declare 59 mac {
     int  TkMacUseMenuID (short macID)
 }
 
-declare 61 mac {
+declare 60 mac {
     RgnHandle  TkMacVisableClipRgn (TkWindow *winPtr)
 }
 
-declare 62 mac {
+declare 61 mac {
     void  TkMacWinBounds (TkWindow *winPtr, Rect *geometry)
 }
 
-declare 63 mac {
+declare 62 mac {
     void  TkMacWindowOffset (WindowRef wRef, int *xOffset, int *yOffset)
 }
 
-declare 64 mac {
+declare 63 mac {
     void  TkResumeClipboard (void)
 }
 
-declare 65 mac {
+declare 64 mac {
     int   TkSetMacColor (unsigned long pixel, RGBColor *macColor)
 }
 
-declare 66 mac {
+declare 65 mac {
     void   TkSetWMName (TkWindow *winPtr, Tk_Uid titleUid)
 }
 
-declare 67 mac {
+declare 66 mac {
     void  TkSuspendClipboard (void)
 }
 
-declare 68 mac {
+declare 67 mac {
     int  TkWMGrowToplevel (WindowRef whichWindow, Point start)
 }
 
-declare 69 mac {
+declare 68 mac {
     int  TkMacZoomToplevel (WindowPtr whichWindow, Point where, short zoomPart)
 }
 
-declare 70 mac {
+declare 69 mac {
     Tk_Window Tk_TopCoordsToWindow (Tk_Window tkwin, \
 	    int rootX, int rootY, int *newX, int *newY)
 }
 
-declare 71 mac {
+declare 70 mac {
     MacDrawable * TkMacContainerId (TkWindow *winPtr)
 }
 
-declare 72 mac {
+declare 71 mac {
     MacDrawable * TkMacGetHostToplevel  (TkWindow *winPtr)
 }
 
@@ -1350,352 +1321,253 @@ declare 78 win {
 
 # X functions for Mac
 
-declare 78 mac {
+declare 0 mac {
     XModifierKeymap* XGetModifierMapping (Display* d)
 }
 
-declare 79 mac {
+declare 1 mac {
     XImage * XCreateImage (Display* d, Visual* v, unsigned int ui1, int i1, \
 	    int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, \
 	    int i4)
 
 }
 
-declare 80 mac {
+declare 2 mac {
     XImage *XGetImage (Display* d, Drawable dr, int i1, int i2, \
 	    unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)
 }
 
-declare 81 mac {
+declare 3 mac {
     char *XGetAtomName (Display* d,Atom a)
 
 }
 
-declare 82 mac {
+declare 4 mac {
     char *XKeysymToString (KeySym k)
 }
 
-declare 83 mac {
+declare 5 mac {
     Colormap XCreateColormap (Display* d, Window w, Visual* v, int i)
 
 }
 
-#  declare 84 mac {
-#      Cursor XCreatePixmapCursor (Display* d, Pixmap p1, Pixmap p2, \
-#  	    XColor* x1, XColor* x2, \
-#  	    unsigned int ui1, unsigned int ui2)
-#  }
-
-#  declare 85 mac {
-#      Cursor XCreateGlyphCursor (Display* d, Font f1, Font f2, \
-#  	    unsigned int ui1, unsigned int ui2, XColor* x1, XColor* x2)
-#  }
-
-declare 86 mac {
+declare 6 mac {
     GContext XGContextFromGC (GC g)
 }
 
-#  declare 87 mac {
-#      XHostAddress *XListHosts (Display* d, int* i, Bool* b)
-#  }
-
-declare 88 mac {
+declare 7 mac {
     KeySym XKeycodeToKeysym (Display* d, KeyCode k, int i)
 }
 
-declare 89 mac {
+declare 8 mac {
     KeySym XStringToKeysym (_Xconst char* c)
 }
 
-declare 90 mac {
+declare 9 mac {
     Window XRootWindow (Display* d, int i)
 }
 
-declare 91 mac {
+declare 10 mac {
     XErrorHandler XSetErrorHandler  (XErrorHandler x)
 }
 
-#  declare 92 mac {
-#      Status XIconifyWindow (Display* d, Window w, int i)
-#  }
-
-#  declare 93 mac {
-#      Status XWithdrawWindow (Display* d, Window w, int i)
-#  }
-
-#  declare 94 mac {
-#      Status XGetWMColormapWindows (Display* d, Window w, Window** wpp, int* ip)
-#  }
-
-declare 95 mac {
+declare 11 mac {
     Status XAllocColor (Display* d, Colormap c, XColor* xp)
 }
 
-declare 96 mac {
+declare 12 mac {
     void XBell (Display* d, int i)
 }
 
-declare 97 mac {
+declare 13 mac {
     void XChangeProperty (Display* d, Window w, Atom a, Atom a, int i1, \
 	    int i2, _Xconst unsigned char* c, int i3)
 }
 
-declare 98 mac {
+declare 14 mac {
     void XChangeWindowAttributes (Display* d, Window w, unsigned long ul, \
 	    XSetWindowAttributes* x)
 }
 
-#  declare 99 mac {
-#      void XClearWindow (Display* d, Window w)
-#  }
-
-declare 100 mac {
+declare 15 mac {
     void XConfigureWindow (Display* d, Window w, unsigned int i, \
 	    XWindowChanges* x)
 }
 
-declare 101 mac {
+declare 16 mac {
     void XCopyArea (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \
 	    int i2, unsigned int ui1, \
 	    unsigned int ui2, int i3, int i4)
 }
 
-declare 102 mac {
+declare 17 mac {
     void XCopyPlane (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \
 	    int i2, unsigned int ui1, \
 	    unsigned int ui2, int i3, int i4, unsigned long ul)
 }
 
-declare 103 mac {
+declare 18 mac {
     void XDefineCursor (Display* d, Window w, Cursor c)
 }
 
-#  declare 104 mac {
-#      void XDeleteProperty (Display* d, Window w, Atom a)
-#  }
-
-declare 105 mac {
+declare 19 mac {
     void XDestroyWindow (Display* d, Window w)
 }
 
-declare 106 mac {
+declare 20 mac {
     void XDrawArc (Display* d, Drawable dr, GC g, int i1, int i2, \
 	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
 
-declare 107 mac {
+declare 21 mac {
     void XDrawLines (Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)
 }
 
-declare 108 mac {
+declare 22 mac {
     void XDrawRectangle (Display* d, Drawable dr, GC g, int i1, int i2,\
 	    unsigned int ui1, unsigned int ui2)
 }
 
-declare 109 mac {
+declare 23 mac {
     void XFillArc (Display* d, Drawable dr, GC g, int i1, int i2, \
 	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
 
-declare 110 mac {
+declare 24 mac {
     void XFillPolygon (Display* d, Drawable dr, GC g, XPoint* x, \
 	    int i1, int i2, int i3)
 }
 
-declare 111 mac {
+declare 25 mac {
     void XFillRectangles (Display* d, Drawable dr, GC g, XRectangle* x, int i)
 }
 
-#  declare 112 mac {
-#      void XForceScreenSaver (Display* d, int i)
-#  }
-
-declare 113 mac {
+declare 26 mac {
     void XFreeColormap (Display* d, Colormap c)
 }
 
-declare 114 mac {
+declare 27 mac {
     void XFreeColors (Display* d, Colormap c, \
 	    unsigned long* ulp, int i, unsigned long ul)
 }
 
-#  declare 115 mac {
-#      void XFreeCursor (Display* d, Cursor c)
-#  }
-
-declare 116 mac {
+declare 28 mac {
     void XFreeModifiermap (XModifierKeymap* x)
 }
 
-declare 117 mac {
+declare 29 mac {
     Status XGetGeometry (Display* d, Drawable dr, Window* w, int* i1, \
 	    int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, \
 	    unsigned int* ui4)
 }
 
-#  declare 118 mac {
-#      void XGetInputFocus (Display* d, Window* w, int* i)
-#  }
-
-declare 119 mac {
+declare 30 mac {
     int XGetWindowProperty (Display* d, Window w, Atom a1, long l1, long l2, \
 	    Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, \
 	    unsigned long* ulp2, unsigned char** cpp)
 }
 
-#  declare 120 mac {
-#      Status XGetWindowAttributes (Display* d, Window w, XWindowAttributes* x)
-#  }
-
-declare 121 mac {
+declare 31 mac {
     int XGrabKeyboard (Display* d, Window w, Bool b, int i1, int i2, Time t)
 }
 
-declare 122 mac {
+declare 32 mac {
     int XGrabPointer (Display* d, Window w1, Bool b, unsigned int ui, \
 	    int i1, int i2, Window w2, Cursor c, Time t)
 }
 
-declare 123 mac {
+declare 33 mac {
     KeyCode XKeysymToKeycode (Display* d, KeySym k)
 }
 
-#  declare 124 mac {
-#      Status XLookupColor (Display* d, Colormap c1, _Xconst char* c2, \
-#  	    XColor* x1, XColor* x2)
-#  }
-
-declare 125 mac {
+declare 34 mac {
     void XMapWindow (Display* d, Window w)
 }
 
-declare 126 mac {
+declare 35 mac {
     void XMoveResizeWindow (Display* d, Window w, int i1, int i2, \
 	    unsigned int ui1, unsigned int ui2)
 }
 
-declare 127 mac {
+declare 36 mac {
     void XMoveWindow (Display* d, Window w, int i1, int i2)
 }
 
-#  declare 128 mac {
-#      void XNextEvent (Display* d, XEvent* x)
-#  }
-
-#  declare 129 mac {
-#      void XPutBackEvent (Display* d, XEvent* x)
-#  }
-
-#  declare 130 mac {
-#      void XQueryColors (Display* d, Colormap c, XColor* x, int i)
-#  }
-
-declare 131 mac {
+declare 37 mac {
     Bool XQueryPointer (Display* d, Window w1, Window* w2, Window* w3, \
 	    int* i1, int* i2, int* i3, int* i4, unsigned int* ui)
 }
 
-#  declare 132 mac {
-#      Status XQueryTree (Display* d, Window w1, Window* w2, Window* w3, \
-#  	    Window** w4, unsigned int* ui)
-#  }
-
-declare 133 mac {
+declare 38 mac {
     void XRaiseWindow (Display* d, Window w)
 }
 
-declare 134 mac {
+declare 39 mac {
     void XRefreshKeyboardMapping (XMappingEvent* x)
 }
 
-declare 135 mac {
+declare 40 mac {
     void XResizeWindow (Display* d, Window w, unsigned int ui1, \
 	    unsigned int ui2)
 }
 
-declare 136 mac {
+declare 41 mac {
     void XSelectInput (Display* d, Window w, long l)
 }
 
-declare 137 mac {
+declare 42 mac {
     Status XSendEvent (Display* d, Window w, Bool b, long l, XEvent* x)
 }
 
-#  declare 138 mac {
-#      void XSetCommand (Display* d, Window w, char** c, int i)
-#  }
-
-declare 139 mac {
+declare 43 mac {
     void XSetIconName (Display* d, Window w, _Xconst char* c)
 }
 
-declare 140 mac {
+declare 44 mac {
     void XSetInputFocus (Display* d, Window w, int i, Time t)
 }
 
-declare 141 mac {
+declare 45 mac {
     void XSetSelectionOwner (Display* d, Atom a, Window w, Time t)
 }
 
-declare 142 mac {
+declare 46 mac {
     void XSetWindowBackground (Display* d, Window w, unsigned long ul)
 }
 
-declare 143 mac {
+declare 47 mac {
     void XSetWindowBackgroundPixmap (Display* d, Window w, Pixmap p)
 }
 
-declare 144 mac {
+declare 48 mac {
     void XSetWindowBorder (Display* d, Window w, unsigned long ul)
 }
 
-declare 145 mac {
+declare 49 mac {
     void XSetWindowBorderPixmap (Display* d, Window w, Pixmap p)
 }
 
-declare 146 mac {
+declare 50 mac {
     void XSetWindowBorderWidth (Display* d, Window w, unsigned int ui)
 }
 
-declare 147 mac {
+declare 51 mac {
     void XSetWindowColormap (Display* d, Window w, Colormap c)
 }
 
-#  declare 148 mac {
-#      Bool XTranslateCoordinates (Display* d, Window w1, Window w2, int i1,\
-#  	    int i2, int* i3, int* i4, Window* w3)
-#  }
-
-declare 149 mac {
+declare 52 mac {
     void XUngrabKeyboard (Display* d, Time t)
 }
 
-declare 150 mac {
+declare 53 mac {
     void XUngrabPointer (Display* d, Time t) 
 }
 
-declare 151 mac {
+declare 54 mac {
     void XUnmapWindow (Display* d, Window w)
 }
 
-#  declare 152 mac {
-#      void XWindowEvent (Display* d, Window w, long l, XEvent* x)
-#  }
-
-#  declare 153 mac {
-#      void XDestroyIC (XIC x)
-#  }
-
-#  declare 154 mac {
-#      Bool XFilterEvent (XEvent* x, Window w)
-#  }
-
-#  declare 155 mac {
-#      int XmbLookupString (XIC xi, XKeyPressedEvent* xk, \
-#  	    char* c, int i, KeySym* k, Status* s)
-#  }
-
-declare 156 mac {
+declare 55 mac {
     void TkPutImage (unsigned long *colors, \
 	    int ncolors, Display* display, Drawable d, \
 	    GC gc, XImage* image, int src_x, int src_y, \
diff --git a/generic/tkInt.h b/generic/tkInt.h
index ead0722..00268ad 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: $Id: tkInt.h,v 1.8.4.1 1999/03/06 00:08:03 redman Exp $ 
+ * RCS: $Id: tkInt.h,v 1.8.4.2 1999/03/07 00:15:44 redman Exp $ 
  */
 
 #ifndef _TKINT
@@ -711,6 +711,10 @@ extern int			tkSendSerial;
 # define TCL_STORAGE_CLASS DLLEXPORT
 #endif
 
+int	TkConsoleInit _ANSI_ARGS_((Tcl_Interp *interp));
+void	TkConsolePrint _ANSI_ARGS_((Tcl_Interp *interp,
+			    int devId, char *buffer, long size));
+
 /*
  * For backwards compatibility, need the tkIntPlatDecls.h here for
  * windows & mac X wrappers.
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 0a3a88c..d02edba 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.1.2.2 1999/03/06 01:54:59 redman Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.1.2.3 1999/03/07 00:15:44 redman Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -59,96 +59,75 @@ EXTERN void		TkpPrintWindowId _ANSI_ARGS_((char * buf,
 /* 9 */
 EXTERN int		TkpScanWindowId _ANSI_ARGS_((Tcl_Interp * interp, 
 				char * string, int * idPtr));
-/* Slot 10 is reserved */
-/* 11 */
+/* 10 */
 EXTERN void		TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr));
-/* 12 */
+/* 11 */
 EXTERN void		TkpSetCursor _ANSI_ARGS_((TkpCursor cursor));
-/* 13 */
+/* 12 */
 EXTERN void		TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, 
 				int state));
-/* 14 */
+/* 13 */
 EXTERN int		TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, 
 				int y, unsigned int width, 
 				unsigned int height));
-/* 15 */
+/* 14 */
 EXTERN void		TkSetPixmapColormap _ANSI_ARGS_((Pixmap pixmap, 
 				Colormap colormap));
-/* 16 */
+/* 15 */
 EXTERN void		TkSetRegion _ANSI_ARGS_((Display* display, GC gc, 
 				TkRegion rgn));
-/* 17 */
+/* 16 */
 EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, 
 				TkRegion src, TkRegion dr_return));
-/* 18 */
+/* 17 */
 EXTERN void		TkWinCancelMouseTimer _ANSI_ARGS_((void));
-/* Slot 19 is reserved */
-/* 20 */
+/* 18 */
 EXTERN void		TkWinClipboardRender _ANSI_ARGS_((
 				TkDisplay * dispPtr, UINT format));
-/* 21 */
+/* 19 */
 EXTERN LRESULT		TkWinEmbeddedEventProc _ANSI_ARGS_((HWND hwnd, 
 				UINT message, WPARAM wParam, LPARAM lParam));
-/* 22 */
+/* 20 */
 EXTERN void		TkWinFillRect _ANSI_ARGS_((HDC dc, int x, int y, 
 				int width, int height, int pixel));
-/* 23 */
+/* 21 */
 EXTERN COLORREF		TkWinGetBorderPixels _ANSI_ARGS_((Tk_Window tkwin, 
 				Tk_3DBorder border, int which));
-/* 24 */
+/* 22 */
 EXTERN HDC		TkWinGetDrawableDC _ANSI_ARGS_((Display * display, 
 				Drawable d, TkWinDCState* state));
-/* 25 */
+/* 23 */
 EXTERN int		TkWinGetModifierState _ANSI_ARGS_((void));
-/* 26 */
+/* 24 */
 EXTERN HPALETTE		TkWinGetSystemPalette _ANSI_ARGS_((void));
-/* 27 */
+/* 25 */
 EXTERN HWND		TkWinGetWrapperWindow _ANSI_ARGS_((Tk_Window tkwin));
-/* 28 */
+/* 26 */
 EXTERN int		TkWinHandleMenuEvent _ANSI_ARGS_((HWND * phwnd, 
 				UINT * pMessage, WPARAM * pwParam, 
 				LPARAM * plParam, LRESULT * plResult));
-/* 29 */
+/* 27 */
 EXTERN int		TkWinIndexOfColor _ANSI_ARGS_((XColor * colorPtr));
-/* 30 */
-EXTERN void		TkWinPointerDeadWindow _ANSI_ARGS_((
-				TkWindow * winPtr));
-/* 31 */
-EXTERN void		TkWinPointerEvent _ANSI_ARGS_((HWND hwnd, int x, 
-				int y));
-/* 32 */
-EXTERN void		TkWinPointerInit _ANSI_ARGS_((void));
-/* 33 */
-EXTERN LRESULT		TkWinReflectMessage _ANSI_ARGS_((HWND hwnd, 
-				UINT message, WPARAM wParam, LPARAM lParam));
-/* 34 */
+/* 28 */
 EXTERN void		TkWinReleaseDrawableDC _ANSI_ARGS_((Drawable d, 
 				HDC hdc, TkWinDCState* state));
-/* 35 */
+/* 29 */
 EXTERN LRESULT		TkWinResendEvent _ANSI_ARGS_((WNDPROC wndproc, 
 				HWND hwnd, XEvent * eventPtr));
-/* 36 */
+/* 30 */
 EXTERN HPALETTE		TkWinSelectPalette _ANSI_ARGS_((HDC dc, 
 				Colormap colormap));
-/* 37 */
+/* 31 */
 EXTERN void		TkWinSetMenu _ANSI_ARGS_((Tk_Window tkwin, 
 				HMENU hMenu));
-/* 38 */
+/* 32 */
 EXTERN void		TkWinSetWindowPos _ANSI_ARGS_((HWND hwnd, 
 				HWND siblingHwnd, int pos));
-/* 39 */
-EXTERN void		TkWinUpdateCursor _ANSI_ARGS_((TkWindow * winPtr));
-/* 40 */
+/* 33 */
 EXTERN void		TkWinWmCleanup _ANSI_ARGS_((HINSTANCE hInstance));
-/* 41 */
-EXTERN HWND		TkWinWmFindEmbedAssociation _ANSI_ARGS_((
-				TkWindow * winPtr));
-/* 42 */
-EXTERN void		TkWinWmStoreEmbedAssociation _ANSI_ARGS_((
-				TkWindow * winPtr, HWND hwnd));
-/* 43 */
+/* 34 */
 EXTERN void		TkWinXCleanup _ANSI_ARGS_((HINSTANCE hInstance));
-/* 44 */
+/* 35 */
 EXTERN void		TkWinXInit _ANSI_ARGS_((HINSTANCE hInstance));
 #endif /* __WIN32__ */
 #if !defined(__WIN32__) && !defined(MAC_TCL)
@@ -202,161 +181,160 @@ EXTERN void		TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr));
 EXTERN void		TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr));
 /* 11 */
 EXTERN void		TkpSetCursor _ANSI_ARGS_((TkpCursor cursor));
-/* Slot 12 is reserved */
-/* 13 */
+/* 12 */
 EXTERN void		TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, 
 				int state));
-/* 14 */
+/* 13 */
 EXTERN int		TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, 
 				int y, unsigned int width, 
 				unsigned int height));
-/* 15 */
+/* 14 */
 EXTERN void		TkSetRegion _ANSI_ARGS_((Display* display, GC gc, 
 				TkRegion rgn));
-/* 16 */
+/* 15 */
 EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, 
 				TkRegion src, TkRegion dr_return));
-/* 17 */
+/* 16 */
 EXTERN int		HandleWMEvent _ANSI_ARGS_((EventRecord * theEvent));
-/* 18 */
+/* 17 */
 EXTERN void		TkAboutDlg _ANSI_ARGS_((void));
-/* 19 */
+/* 18 */
 EXTERN void		TkCreateMacEventSource _ANSI_ARGS_((void));
-/* 20 */
+/* 19 */
 EXTERN void		TkFontList _ANSI_ARGS_((Tcl_Interp * interp, 
 				Display * display));
-/* 21 */
+/* 20 */
 EXTERN Window		TkGetTransientMaster _ANSI_ARGS_((TkWindow * winPtr));
-/* 22 */
+/* 21 */
 EXTERN int		TkGenerateButtonEvent _ANSI_ARGS_((int x, int y, 
 				Window window, unsigned int state));
-/* 23 */
+/* 22 */
 EXTERN int		TkGetCharPositions _ANSI_ARGS_((
 				XFontStruct * font_struct, char * string, 
 				int count, short * buffer));
-/* 24 */
+/* 23 */
 EXTERN void		TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin));
-/* 25 */
+/* 24 */
 EXTERN void		TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin, 
 				int x, int y, int width, int height, 
 				int flags));
-/* 26 */
+/* 25 */
 EXTERN unsigned int	TkMacButtonKeyState _ANSI_ARGS_((void));
-/* 27 */
+/* 26 */
 EXTERN void		TkMacClearMenubarActive _ANSI_ARGS_((void));
-/* 28 */
+/* 27 */
 EXTERN int		TkMacConvertEvent _ANSI_ARGS_((
 				EventRecord * eventPtr));
-/* 29 */
+/* 28 */
 EXTERN int		TkMacDispatchMenuEvent _ANSI_ARGS_((int menuID, 
 				int index));
-/* 30 */
+/* 29 */
 EXTERN void		TkMacInstallCursor _ANSI_ARGS_((int resizeOverride));
-/* 31 */
+/* 30 */
 EXTERN int		TkMacConvertTkEvent _ANSI_ARGS_((
 				EventRecord * eventPtr, Window window));
-/* 32 */
+/* 31 */
 EXTERN void		TkMacHandleTearoffMenu _ANSI_ARGS_((void));
-/* 33 */
+/* 32 */
 EXTERN void		tkMacInstallMWConsole _ANSI_ARGS_((
 				Tcl_Interp * interp));
-/* 34 */
+/* 33 */
 EXTERN void		TkMacInvalClipRgns _ANSI_ARGS_((TkWindow * winPtr));
-/* 35 */
+/* 34 */
 EXTERN void		TkMacDoHLEvent _ANSI_ARGS_((EventRecord * theEvent));
-/* 36 */
+/* 35 */
 EXTERN void		TkMacFontInfo _ANSI_ARGS_((Font fontId, 
 				short * family, short * style, short * size));
-/* 37 */
+/* 36 */
 EXTERN Time		TkMacGenerateTime _ANSI_ARGS_((void));
-/* 38 */
+/* 37 */
 EXTERN GWorldPtr	TkMacGetDrawablePort _ANSI_ARGS_((Drawable drawable));
-/* 39 */
+/* 38 */
 EXTERN TkWindow *	TkMacGetScrollbarGrowWindow _ANSI_ARGS_((
 				TkWindow * winPtr));
-/* 40 */
+/* 39 */
 EXTERN Window		TkMacGetXWindow _ANSI_ARGS_((WindowRef macWinPtr));
-/* 41 */
+/* 40 */
 EXTERN int		TkMacGrowToplevel _ANSI_ARGS_((WindowRef whichWindow, 
 				Point start));
-/* 42 */
+/* 41 */
 EXTERN void		TkMacHandleMenuSelect _ANSI_ARGS_((long mResult, 
 				int optionKeyPressed));
-/* 43 */
+/* 42 */
 EXTERN int		TkMacHaveAppearance _ANSI_ARGS_((void));
-/* 44 */
+/* 43 */
 EXTERN void		TkMacInitAppleEvents _ANSI_ARGS_((
 				Tcl_Interp * interp));
-/* 45 */
+/* 44 */
 EXTERN void		TkMacInitMenus _ANSI_ARGS_((Tcl_Interp * interp));
-/* 46 */
+/* 45 */
 EXTERN void		TkMacInvalidateWindow _ANSI_ARGS_((
 				MacDrawable * macWin, int flag));
-/* 47 */
+/* 46 */
 EXTERN int		TkMacIsCharacterMissing _ANSI_ARGS_((Tk_Font tkfont, 
 				unsigned int searchChar));
-/* 48 */
+/* 47 */
 EXTERN void		TkMacMakeRealWindowExist _ANSI_ARGS_((
 				TkWindow * winPtr));
-/* 49 */
+/* 48 */
 EXTERN BitMapPtr	TkMacMakeStippleMap _ANSI_ARGS_((Drawable d1, 
 				Drawable d2));
-/* 50 */
+/* 49 */
 EXTERN void		TkMacMenuClick _ANSI_ARGS_((void));
-/* 51 */
+/* 50 */
 EXTERN void		TkMacRegisterOffScreenWindow _ANSI_ARGS_((
 				Window window, GWorldPtr portPtr));
-/* 52 */
+/* 51 */
 EXTERN int		TkMacResizable _ANSI_ARGS_((TkWindow * winPtr));
-/* 53 */
+/* 52 */
 EXTERN void		TkMacSetEmbedRgn _ANSI_ARGS_((TkWindow * winPtr, 
 				RgnHandle rgn));
-/* 54 */
+/* 53 */
 EXTERN void		TkMacSetHelpMenuItemCount _ANSI_ARGS_((void));
-/* 55 */
+/* 54 */
 EXTERN void		TkMacSetScrollbarGrow _ANSI_ARGS_((TkWindow * winPtr, 
 				int flag));
-/* 56 */
+/* 55 */
 EXTERN void		TkMacSetUpClippingRgn _ANSI_ARGS_((Drawable drawable));
-/* 57 */
+/* 56 */
 EXTERN void		TkMacSetUpGraphicsPort _ANSI_ARGS_((GC gc));
-/* 58 */
+/* 57 */
 EXTERN void		TkMacUpdateClipRgn _ANSI_ARGS_((TkWindow * winPtr));
-/* 59 */
+/* 58 */
 EXTERN void		TkMacUnregisterMacWindow _ANSI_ARGS_((
 				GWorldPtr portPtr));
-/* 60 */
+/* 59 */
 EXTERN int		TkMacUseMenuID _ANSI_ARGS_((short macID));
-/* 61 */
+/* 60 */
 EXTERN RgnHandle	TkMacVisableClipRgn _ANSI_ARGS_((TkWindow * winPtr));
-/* 62 */
+/* 61 */
 EXTERN void		TkMacWinBounds _ANSI_ARGS_((TkWindow * winPtr, 
 				Rect * geometry));
-/* 63 */
+/* 62 */
 EXTERN void		TkMacWindowOffset _ANSI_ARGS_((WindowRef wRef, 
 				int * xOffset, int * yOffset));
-/* 64 */
+/* 63 */
 EXTERN void		TkResumeClipboard _ANSI_ARGS_((void));
-/* 65 */
+/* 64 */
 EXTERN int		TkSetMacColor _ANSI_ARGS_((unsigned long pixel, 
 				RGBColor * macColor));
-/* 66 */
+/* 65 */
 EXTERN void		TkSetWMName _ANSI_ARGS_((TkWindow * winPtr, 
 				Tk_Uid titleUid));
-/* 67 */
+/* 66 */
 EXTERN void		TkSuspendClipboard _ANSI_ARGS_((void));
-/* 68 */
+/* 67 */
 EXTERN int		TkWMGrowToplevel _ANSI_ARGS_((WindowRef whichWindow, 
 				Point start));
-/* 69 */
+/* 68 */
 EXTERN int		TkMacZoomToplevel _ANSI_ARGS_((WindowPtr whichWindow, 
 				Point where, short zoomPart));
-/* 70 */
+/* 69 */
 EXTERN Tk_Window	Tk_TopCoordsToWindow _ANSI_ARGS_((Tk_Window tkwin, 
 				int rootX, int rootY, int * newX, int * newY));
-/* 71 */
+/* 70 */
 EXTERN MacDrawable *	TkMacContainerId _ANSI_ARGS_((TkWindow * winPtr));
-/* 72 */
+/* 71 */
 EXTERN MacDrawable *	TkMacGetHostToplevel _ANSI_ARGS_((TkWindow * winPtr));
 #endif /* MAC_TCL */
 
@@ -375,41 +353,32 @@ typedef struct TkIntPlatStubs {
     void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 7 */
     void (*tkpPrintWindowId) _ANSI_ARGS_((char * buf, Window window)); /* 8 */
     int (*tkpScanWindowId) _ANSI_ARGS_((Tcl_Interp * interp, char * string, int * idPtr)); /* 9 */
-    void *reserved10;
-    void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 11 */
-    void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 12 */
-    void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 13 */
-    int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 14 */
-    void (*tkSetPixmapColormap) _ANSI_ARGS_((Pixmap pixmap, Colormap colormap)); /* 15 */
-    void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 16 */
-    void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 17 */
-    void (*tkWinCancelMouseTimer) _ANSI_ARGS_((void)); /* 18 */
-    void *reserved19;
-    void (*tkWinClipboardRender) _ANSI_ARGS_((TkDisplay * dispPtr, UINT format)); /* 20 */
-    LRESULT (*tkWinEmbeddedEventProc) _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)); /* 21 */
-    void (*tkWinFillRect) _ANSI_ARGS_((HDC dc, int x, int y, int width, int height, int pixel)); /* 22 */
-    COLORREF (*tkWinGetBorderPixels) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int which)); /* 23 */
-    HDC (*tkWinGetDrawableDC) _ANSI_ARGS_((Display * display, Drawable d, TkWinDCState* state)); /* 24 */
-    int (*tkWinGetModifierState) _ANSI_ARGS_((void)); /* 25 */
-    HPALETTE (*tkWinGetSystemPalette) _ANSI_ARGS_((void)); /* 26 */
-    HWND (*tkWinGetWrapperWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 27 */
-    int (*tkWinHandleMenuEvent) _ANSI_ARGS_((HWND * phwnd, UINT * pMessage, WPARAM * pwParam, LPARAM * plParam, LRESULT * plResult)); /* 28 */
-    int (*tkWinIndexOfColor) _ANSI_ARGS_((XColor * colorPtr)); /* 29 */
-    void (*tkWinPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 30 */
-    void (*tkWinPointerEvent) _ANSI_ARGS_((HWND hwnd, int x, int y)); /* 31 */
-    void (*tkWinPointerInit) _ANSI_ARGS_((void)); /* 32 */
-    LRESULT (*tkWinReflectMessage) _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)); /* 33 */
-    void (*tkWinReleaseDrawableDC) _ANSI_ARGS_((Drawable d, HDC hdc, TkWinDCState* state)); /* 34 */
-    LRESULT (*tkWinResendEvent) _ANSI_ARGS_((WNDPROC wndproc, HWND hwnd, XEvent * eventPtr)); /* 35 */
-    HPALETTE (*tkWinSelectPalette) _ANSI_ARGS_((HDC dc, Colormap colormap)); /* 36 */
-    void (*tkWinSetMenu) _ANSI_ARGS_((Tk_Window tkwin, HMENU hMenu)); /* 37 */
-    void (*tkWinSetWindowPos) _ANSI_ARGS_((HWND hwnd, HWND siblingHwnd, int pos)); /* 38 */
-    void (*tkWinUpdateCursor) _ANSI_ARGS_((TkWindow * winPtr)); /* 39 */
-    void (*tkWinWmCleanup) _ANSI_ARGS_((HINSTANCE hInstance)); /* 40 */
-    HWND (*tkWinWmFindEmbedAssociation) _ANSI_ARGS_((TkWindow * winPtr)); /* 41 */
-    void (*tkWinWmStoreEmbedAssociation) _ANSI_ARGS_((TkWindow * winPtr, HWND hwnd)); /* 42 */
-    void (*tkWinXCleanup) _ANSI_ARGS_((HINSTANCE hInstance)); /* 43 */
-    void (*tkWinXInit) _ANSI_ARGS_((HINSTANCE hInstance)); /* 44 */
+    void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 10 */
+    void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 11 */
+    void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 12 */
+    int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 13 */
+    void (*tkSetPixmapColormap) _ANSI_ARGS_((Pixmap pixmap, Colormap colormap)); /* 14 */
+    void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 15 */
+    void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 16 */
+    void (*tkWinCancelMouseTimer) _ANSI_ARGS_((void)); /* 17 */
+    void (*tkWinClipboardRender) _ANSI_ARGS_((TkDisplay * dispPtr, UINT format)); /* 18 */
+    LRESULT (*tkWinEmbeddedEventProc) _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)); /* 19 */
+    void (*tkWinFillRect) _ANSI_ARGS_((HDC dc, int x, int y, int width, int height, int pixel)); /* 20 */
+    COLORREF (*tkWinGetBorderPixels) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int which)); /* 21 */
+    HDC (*tkWinGetDrawableDC) _ANSI_ARGS_((Display * display, Drawable d, TkWinDCState* state)); /* 22 */
+    int (*tkWinGetModifierState) _ANSI_ARGS_((void)); /* 23 */
+    HPALETTE (*tkWinGetSystemPalette) _ANSI_ARGS_((void)); /* 24 */
+    HWND (*tkWinGetWrapperWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 25 */
+    int (*tkWinHandleMenuEvent) _ANSI_ARGS_((HWND * phwnd, UINT * pMessage, WPARAM * pwParam, LPARAM * plParam, LRESULT * plResult)); /* 26 */
+    int (*tkWinIndexOfColor) _ANSI_ARGS_((XColor * colorPtr)); /* 27 */
+    void (*tkWinReleaseDrawableDC) _ANSI_ARGS_((Drawable d, HDC hdc, TkWinDCState* state)); /* 28 */
+    LRESULT (*tkWinResendEvent) _ANSI_ARGS_((WNDPROC wndproc, HWND hwnd, XEvent * eventPtr)); /* 29 */
+    HPALETTE (*tkWinSelectPalette) _ANSI_ARGS_((HDC dc, Colormap colormap)); /* 30 */
+    void (*tkWinSetMenu) _ANSI_ARGS_((Tk_Window tkwin, HMENU hMenu)); /* 31 */
+    void (*tkWinSetWindowPos) _ANSI_ARGS_((HWND hwnd, HWND siblingHwnd, int pos)); /* 32 */
+    void (*tkWinWmCleanup) _ANSI_ARGS_((HINSTANCE hInstance)); /* 33 */
+    void (*tkWinXCleanup) _ANSI_ARGS_((HINSTANCE hInstance)); /* 34 */
+    void (*tkWinXInit) _ANSI_ARGS_((HINSTANCE hInstance)); /* 35 */
 #endif /* __WIN32__ */
 #if !defined(__WIN32__) && !defined(MAC_TCL)
     void (*tkCreateXEventSource) _ANSI_ARGS_((void)); /* 0 */
@@ -434,67 +403,66 @@ typedef struct TkIntPlatStubs {
     void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 9 */
     void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 10 */
     void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 11 */
-    void *reserved12;
-    void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 13 */
-    int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 14 */
-    void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 15 */
-    void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 16 */
-    int (*handleWMEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 17 */
-    void (*tkAboutDlg) _ANSI_ARGS_((void)); /* 18 */
-    void (*tkCreateMacEventSource) _ANSI_ARGS_((void)); /* 19 */
-    void (*tkFontList) _ANSI_ARGS_((Tcl_Interp * interp, Display * display)); /* 20 */
-    Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow * winPtr)); /* 21 */
-    int (*tkGenerateButtonEvent) _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* 22 */
-    int (*tkGetCharPositions) _ANSI_ARGS_((XFontStruct * font_struct, char * string, int count, short * buffer)); /* 23 */
-    void (*tkGenWMDestroyEvent) _ANSI_ARGS_((Tk_Window tkwin)); /* 24 */
-    void (*tkGenWMConfigureEvent) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 25 */
-    unsigned int (*tkMacButtonKeyState) _ANSI_ARGS_((void)); /* 26 */
-    void (*tkMacClearMenubarActive) _ANSI_ARGS_((void)); /* 27 */
-    int (*tkMacConvertEvent) _ANSI_ARGS_((EventRecord * eventPtr)); /* 28 */
-    int (*tkMacDispatchMenuEvent) _ANSI_ARGS_((int menuID, int index)); /* 29 */
-    void (*tkMacInstallCursor) _ANSI_ARGS_((int resizeOverride)); /* 30 */
-    int (*tkMacConvertTkEvent) _ANSI_ARGS_((EventRecord * eventPtr, Window window)); /* 31 */
-    void (*tkMacHandleTearoffMenu) _ANSI_ARGS_((void)); /* 32 */
-    void (*tkMacInstallMWConsole) _ANSI_ARGS_((Tcl_Interp * interp)); /* 33 */
-    void (*tkMacInvalClipRgns) _ANSI_ARGS_((TkWindow * winPtr)); /* 34 */
-    void (*tkMacDoHLEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 35 */
-    void (*tkMacFontInfo) _ANSI_ARGS_((Font fontId, short * family, short * style, short * size)); /* 36 */
-    Time (*tkMacGenerateTime) _ANSI_ARGS_((void)); /* 37 */
-    GWorldPtr (*tkMacGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 38 */
-    TkWindow * (*tkMacGetScrollbarGrowWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 39 */
-    Window (*tkMacGetXWindow) _ANSI_ARGS_((WindowRef macWinPtr)); /* 40 */
-    int (*tkMacGrowToplevel) _ANSI_ARGS_((WindowRef whichWindow, Point start)); /* 41 */
-    void (*tkMacHandleMenuSelect) _ANSI_ARGS_((long mResult, int optionKeyPressed)); /* 42 */
-    int (*tkMacHaveAppearance) _ANSI_ARGS_((void)); /* 43 */
-    void (*tkMacInitAppleEvents) _ANSI_ARGS_((Tcl_Interp * interp)); /* 44 */
-    void (*tkMacInitMenus) _ANSI_ARGS_((Tcl_Interp * interp)); /* 45 */
-    void (*tkMacInvalidateWindow) _ANSI_ARGS_((MacDrawable * macWin, int flag)); /* 46 */
-    int (*tkMacIsCharacterMissing) _ANSI_ARGS_((Tk_Font tkfont, unsigned int searchChar)); /* 47 */
-    void (*tkMacMakeRealWindowExist) _ANSI_ARGS_((TkWindow * winPtr)); /* 48 */
-    BitMapPtr (*tkMacMakeStippleMap) _ANSI_ARGS_((Drawable d1, Drawable d2)); /* 49 */
-    void (*tkMacMenuClick) _ANSI_ARGS_((void)); /* 50 */
-    void (*tkMacRegisterOffScreenWindow) _ANSI_ARGS_((Window window, GWorldPtr portPtr)); /* 51 */
-    int (*tkMacResizable) _ANSI_ARGS_((TkWindow * winPtr)); /* 52 */
-    void (*tkMacSetEmbedRgn) _ANSI_ARGS_((TkWindow * winPtr, RgnHandle rgn)); /* 53 */
-    void (*tkMacSetHelpMenuItemCount) _ANSI_ARGS_((void)); /* 54 */
-    void (*tkMacSetScrollbarGrow) _ANSI_ARGS_((TkWindow * winPtr, int flag)); /* 55 */
-    void (*tkMacSetUpClippingRgn) _ANSI_ARGS_((Drawable drawable)); /* 56 */
-    void (*tkMacSetUpGraphicsPort) _ANSI_ARGS_((GC gc)); /* 57 */
-    void (*tkMacUpdateClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 58 */
-    void (*tkMacUnregisterMacWindow) _ANSI_ARGS_((GWorldPtr portPtr)); /* 59 */
-    int (*tkMacUseMenuID) _ANSI_ARGS_((short macID)); /* 60 */
-    RgnHandle (*tkMacVisableClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 61 */
-    void (*tkMacWinBounds) _ANSI_ARGS_((TkWindow * winPtr, Rect * geometry)); /* 62 */
-    void (*tkMacWindowOffset) _ANSI_ARGS_((WindowRef wRef, int * xOffset, int * yOffset)); /* 63 */
-    void (*tkResumeClipboard) _ANSI_ARGS_((void)); /* 64 */
-    int (*tkSetMacColor) _ANSI_ARGS_((unsigned long pixel, RGBColor * macColor)); /* 65 */
-    void (*tkSetWMName) _ANSI_ARGS_((TkWindow * winPtr, Tk_Uid titleUid)); /* 66 */
-    void (*tkSuspendClipboard) _ANSI_ARGS_((void)); /* 67 */
-    int (*tkWMGrowToplevel) _ANSI_ARGS_((WindowRef whichWindow, Point start)); /* 68 */
-    int (*tkMacZoomToplevel) _ANSI_ARGS_((WindowPtr whichWindow, Point where, short zoomPart)); /* 69 */
-    Tk_Window (*tk_TopCoordsToWindow) _ANSI_ARGS_((Tk_Window tkwin, int rootX, int rootY, int * newX, int * newY)); /* 70 */
-    MacDrawable * (*tkMacContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 71 */
-    MacDrawable * (*tkMacGetHostToplevel) _ANSI_ARGS_((TkWindow * winPtr)); /* 72 */
+    void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 12 */
+    int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 13 */
+    void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 14 */
+    void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 15 */
+    int (*handleWMEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 16 */
+    void (*tkAboutDlg) _ANSI_ARGS_((void)); /* 17 */
+    void (*tkCreateMacEventSource) _ANSI_ARGS_((void)); /* 18 */
+    void (*tkFontList) _ANSI_ARGS_((Tcl_Interp * interp, Display * display)); /* 19 */
+    Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow * winPtr)); /* 20 */
+    int (*tkGenerateButtonEvent) _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* 21 */
+    int (*tkGetCharPositions) _ANSI_ARGS_((XFontStruct * font_struct, char * string, int count, short * buffer)); /* 22 */
+    void (*tkGenWMDestroyEvent) _ANSI_ARGS_((Tk_Window tkwin)); /* 23 */
+    void (*tkGenWMConfigureEvent) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 24 */
+    unsigned int (*tkMacButtonKeyState) _ANSI_ARGS_((void)); /* 25 */
+    void (*tkMacClearMenubarActive) _ANSI_ARGS_((void)); /* 26 */
+    int (*tkMacConvertEvent) _ANSI_ARGS_((EventRecord * eventPtr)); /* 27 */
+    int (*tkMacDispatchMenuEvent) _ANSI_ARGS_((int menuID, int index)); /* 28 */
+    void (*tkMacInstallCursor) _ANSI_ARGS_((int resizeOverride)); /* 29 */
+    int (*tkMacConvertTkEvent) _ANSI_ARGS_((EventRecord * eventPtr, Window window)); /* 30 */
+    void (*tkMacHandleTearoffMenu) _ANSI_ARGS_((void)); /* 31 */
+    void (*tkMacInstallMWConsole) _ANSI_ARGS_((Tcl_Interp * interp)); /* 32 */
+    void (*tkMacInvalClipRgns) _ANSI_ARGS_((TkWindow * winPtr)); /* 33 */
+    void (*tkMacDoHLEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 34 */
+    void (*tkMacFontInfo) _ANSI_ARGS_((Font fontId, short * family, short * style, short * size)); /* 35 */
+    Time (*tkMacGenerateTime) _ANSI_ARGS_((void)); /* 36 */
+    GWorldPtr (*tkMacGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 37 */
+    TkWindow * (*tkMacGetScrollbarGrowWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 38 */
+    Window (*tkMacGetXWindow) _ANSI_ARGS_((WindowRef macWinPtr)); /* 39 */
+    int (*tkMacGrowToplevel) _ANSI_ARGS_((WindowRef whichWindow, Point start)); /* 40 */
+    void (*tkMacHandleMenuSelect) _ANSI_ARGS_((long mResult, int optionKeyPressed)); /* 41 */
+    int (*tkMacHaveAppearance) _ANSI_ARGS_((void)); /* 42 */
+    void (*tkMacInitAppleEvents) _ANSI_ARGS_((Tcl_Interp * interp)); /* 43 */
+    void (*tkMacInitMenus) _ANSI_ARGS_((Tcl_Interp * interp)); /* 44 */
+    void (*tkMacInvalidateWindow) _ANSI_ARGS_((MacDrawable * macWin, int flag)); /* 45 */
+    int (*tkMacIsCharacterMissing) _ANSI_ARGS_((Tk_Font tkfont, unsigned int searchChar)); /* 46 */
+    void (*tkMacMakeRealWindowExist) _ANSI_ARGS_((TkWindow * winPtr)); /* 47 */
+    BitMapPtr (*tkMacMakeStippleMap) _ANSI_ARGS_((Drawable d1, Drawable d2)); /* 48 */
+    void (*tkMacMenuClick) _ANSI_ARGS_((void)); /* 49 */
+    void (*tkMacRegisterOffScreenWindow) _ANSI_ARGS_((Window window, GWorldPtr portPtr)); /* 50 */
+    int (*tkMacResizable) _ANSI_ARGS_((TkWindow * winPtr)); /* 51 */
+    void (*tkMacSetEmbedRgn) _ANSI_ARGS_((TkWindow * winPtr, RgnHandle rgn)); /* 52 */
+    void (*tkMacSetHelpMenuItemCount) _ANSI_ARGS_((void)); /* 53 */
+    void (*tkMacSetScrollbarGrow) _ANSI_ARGS_((TkWindow * winPtr, int flag)); /* 54 */
+    void (*tkMacSetUpClippingRgn) _ANSI_ARGS_((Drawable drawable)); /* 55 */
+    void (*tkMacSetUpGraphicsPort) _ANSI_ARGS_((GC gc)); /* 56 */
+    void (*tkMacUpdateClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 57 */
+    void (*tkMacUnregisterMacWindow) _ANSI_ARGS_((GWorldPtr portPtr)); /* 58 */
+    int (*tkMacUseMenuID) _ANSI_ARGS_((short macID)); /* 59 */
+    RgnHandle (*tkMacVisableClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 60 */
+    void (*tkMacWinBounds) _ANSI_ARGS_((TkWindow * winPtr, Rect * geometry)); /* 61 */
+    void (*tkMacWindowOffset) _ANSI_ARGS_((WindowRef wRef, int * xOffset, int * yOffset)); /* 62 */
+    void (*tkResumeClipboard) _ANSI_ARGS_((void)); /* 63 */
+    int (*tkSetMacColor) _ANSI_ARGS_((unsigned long pixel, RGBColor * macColor)); /* 64 */
+    void (*tkSetWMName) _ANSI_ARGS_((TkWindow * winPtr, Tk_Uid titleUid)); /* 65 */
+    void (*tkSuspendClipboard) _ANSI_ARGS_((void)); /* 66 */
+    int (*tkWMGrowToplevel) _ANSI_ARGS_((WindowRef whichWindow, Point start)); /* 67 */
+    int (*tkMacZoomToplevel) _ANSI_ARGS_((WindowPtr whichWindow, Point where, short zoomPart)); /* 68 */
+    Tk_Window (*tk_TopCoordsToWindow) _ANSI_ARGS_((Tk_Window tkwin, int rootX, int rootY, int * newX, int * newY)); /* 69 */
+    MacDrawable * (*tkMacContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 70 */
+    MacDrawable * (*tkMacGetHostToplevel) _ANSI_ARGS_((TkWindow * winPtr)); /* 71 */
 #endif /* MAC_TCL */
 } TkIntPlatStubs;
 
@@ -547,139 +515,109 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkpScanWindowId(interp, string, idPtr) \
 	(tkIntPlatStubsPtr->tkpScanWindowId)(interp, string, idPtr) /* 9 */
 #endif
-/* Slot 10 is reserved */
 #ifndef TkpSetCapture
 #define TkpSetCapture(winPtr) \
-	(tkIntPlatStubsPtr->tkpSetCapture)(winPtr) /* 11 */
+	(tkIntPlatStubsPtr->tkpSetCapture)(winPtr) /* 10 */
 #endif
 #ifndef TkpSetCursor
 #define TkpSetCursor(cursor) \
-	(tkIntPlatStubsPtr->tkpSetCursor)(cursor) /* 12 */
+	(tkIntPlatStubsPtr->tkpSetCursor)(cursor) /* 11 */
 #endif
 #ifndef TkpWmSetState
 #define TkpWmSetState(winPtr, state) \
-	(tkIntPlatStubsPtr->tkpWmSetState)(winPtr, state) /* 13 */
+	(tkIntPlatStubsPtr->tkpWmSetState)(winPtr, state) /* 12 */
 #endif
 #ifndef TkRectInRegion
 #define TkRectInRegion(rgn, x, y, width, height) \
-	(tkIntPlatStubsPtr->tkRectInRegion)(rgn, x, y, width, height) /* 14 */
+	(tkIntPlatStubsPtr->tkRectInRegion)(rgn, x, y, width, height) /* 13 */
 #endif
 #ifndef TkSetPixmapColormap
 #define TkSetPixmapColormap(pixmap, colormap) \
-	(tkIntPlatStubsPtr->tkSetPixmapColormap)(pixmap, colormap) /* 15 */
+	(tkIntPlatStubsPtr->tkSetPixmapColormap)(pixmap, colormap) /* 14 */
 #endif
 #ifndef TkSetRegion
 #define TkSetRegion(display, gc, rgn) \
-	(tkIntPlatStubsPtr->tkSetRegion)(display, gc, rgn) /* 16 */
+	(tkIntPlatStubsPtr->tkSetRegion)(display, gc, rgn) /* 15 */
 #endif
 #ifndef TkUnionRectWithRegion
 #define TkUnionRectWithRegion(rect, src, dr_return) \
-	(tkIntPlatStubsPtr->tkUnionRectWithRegion)(rect, src, dr_return) /* 17 */
+	(tkIntPlatStubsPtr->tkUnionRectWithRegion)(rect, src, dr_return) /* 16 */
 #endif
 #ifndef TkWinCancelMouseTimer
 #define TkWinCancelMouseTimer() \
-	(tkIntPlatStubsPtr->tkWinCancelMouseTimer)() /* 18 */
+	(tkIntPlatStubsPtr->tkWinCancelMouseTimer)() /* 17 */
 #endif
-/* Slot 19 is reserved */
 #ifndef TkWinClipboardRender
 #define TkWinClipboardRender(dispPtr, format) \
-	(tkIntPlatStubsPtr->tkWinClipboardRender)(dispPtr, format) /* 20 */
+	(tkIntPlatStubsPtr->tkWinClipboardRender)(dispPtr, format) /* 18 */
 #endif
 #ifndef TkWinEmbeddedEventProc
 #define TkWinEmbeddedEventProc(hwnd, message, wParam, lParam) \
-	(tkIntPlatStubsPtr->tkWinEmbeddedEventProc)(hwnd, message, wParam, lParam) /* 21 */
+	(tkIntPlatStubsPtr->tkWinEmbeddedEventProc)(hwnd, message, wParam, lParam) /* 19 */
 #endif
 #ifndef TkWinFillRect
 #define TkWinFillRect(dc, x, y, width, height, pixel) \
-	(tkIntPlatStubsPtr->tkWinFillRect)(dc, x, y, width, height, pixel) /* 22 */
+	(tkIntPlatStubsPtr->tkWinFillRect)(dc, x, y, width, height, pixel) /* 20 */
 #endif
 #ifndef TkWinGetBorderPixels
 #define TkWinGetBorderPixels(tkwin, border, which) \
-	(tkIntPlatStubsPtr->tkWinGetBorderPixels)(tkwin, border, which) /* 23 */
+	(tkIntPlatStubsPtr->tkWinGetBorderPixels)(tkwin, border, which) /* 21 */
 #endif
 #ifndef TkWinGetDrawableDC
 #define TkWinGetDrawableDC(display, d, state) \
-	(tkIntPlatStubsPtr->tkWinGetDrawableDC)(display, d, state) /* 24 */
+	(tkIntPlatStubsPtr->tkWinGetDrawableDC)(display, d, state) /* 22 */
 #endif
 #ifndef TkWinGetModifierState
 #define TkWinGetModifierState() \
-	(tkIntPlatStubsPtr->tkWinGetModifierState)() /* 25 */
+	(tkIntPlatStubsPtr->tkWinGetModifierState)() /* 23 */
 #endif
 #ifndef TkWinGetSystemPalette
 #define TkWinGetSystemPalette() \
-	(tkIntPlatStubsPtr->tkWinGetSystemPalette)() /* 26 */
+	(tkIntPlatStubsPtr->tkWinGetSystemPalette)() /* 24 */
 #endif
 #ifndef TkWinGetWrapperWindow
 #define TkWinGetWrapperWindow(tkwin) \
-	(tkIntPlatStubsPtr->tkWinGetWrapperWindow)(tkwin) /* 27 */
+	(tkIntPlatStubsPtr->tkWinGetWrapperWindow)(tkwin) /* 25 */
 #endif
 #ifndef TkWinHandleMenuEvent
 #define TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult) \
-	(tkIntPlatStubsPtr->tkWinHandleMenuEvent)(phwnd, pMessage, pwParam, plParam, plResult) /* 28 */
+	(tkIntPlatStubsPtr->tkWinHandleMenuEvent)(phwnd, pMessage, pwParam, plParam, plResult) /* 26 */
 #endif
 #ifndef TkWinIndexOfColor
 #define TkWinIndexOfColor(colorPtr) \
-	(tkIntPlatStubsPtr->tkWinIndexOfColor)(colorPtr) /* 29 */
-#endif
-#ifndef TkWinPointerDeadWindow
-#define TkWinPointerDeadWindow(winPtr) \
-	(tkIntPlatStubsPtr->tkWinPointerDeadWindow)(winPtr) /* 30 */
-#endif
-#ifndef TkWinPointerEvent
-#define TkWinPointerEvent(hwnd, x, y) \
-	(tkIntPlatStubsPtr->tkWinPointerEvent)(hwnd, x, y) /* 31 */
-#endif
-#ifndef TkWinPointerInit
-#define TkWinPointerInit() \
-	(tkIntPlatStubsPtr->tkWinPointerInit)() /* 32 */
-#endif
-#ifndef TkWinReflectMessage
-#define TkWinReflectMessage(hwnd, message, wParam, lParam) \
-	(tkIntPlatStubsPtr->tkWinReflectMessage)(hwnd, message, wParam, lParam) /* 33 */
+	(tkIntPlatStubsPtr->tkWinIndexOfColor)(colorPtr) /* 27 */
 #endif
 #ifndef TkWinReleaseDrawableDC
 #define TkWinReleaseDrawableDC(d, hdc, state) \
-	(tkIntPlatStubsPtr->tkWinReleaseDrawableDC)(d, hdc, state) /* 34 */
+	(tkIntPlatStubsPtr->tkWinReleaseDrawableDC)(d, hdc, state) /* 28 */
 #endif
 #ifndef TkWinResendEvent
 #define TkWinResendEvent(wndproc, hwnd, eventPtr) \
-	(tkIntPlatStubsPtr->tkWinResendEvent)(wndproc, hwnd, eventPtr) /* 35 */
+	(tkIntPlatStubsPtr->tkWinResendEvent)(wndproc, hwnd, eventPtr) /* 29 */
 #endif
 #ifndef TkWinSelectPalette
 #define TkWinSelectPalette(dc, colormap) \
-	(tkIntPlatStubsPtr->tkWinSelectPalette)(dc, colormap) /* 36 */
+	(tkIntPlatStubsPtr->tkWinSelectPalette)(dc, colormap) /* 30 */
 #endif
 #ifndef TkWinSetMenu
 #define TkWinSetMenu(tkwin, hMenu) \
-	(tkIntPlatStubsPtr->tkWinSetMenu)(tkwin, hMenu) /* 37 */
+	(tkIntPlatStubsPtr->tkWinSetMenu)(tkwin, hMenu) /* 31 */
 #endif
 #ifndef TkWinSetWindowPos
 #define TkWinSetWindowPos(hwnd, siblingHwnd, pos) \
-	(tkIntPlatStubsPtr->tkWinSetWindowPos)(hwnd, siblingHwnd, pos) /* 38 */
-#endif
-#ifndef TkWinUpdateCursor
-#define TkWinUpdateCursor(winPtr) \
-	(tkIntPlatStubsPtr->tkWinUpdateCursor)(winPtr) /* 39 */
+	(tkIntPlatStubsPtr->tkWinSetWindowPos)(hwnd, siblingHwnd, pos) /* 32 */
 #endif
 #ifndef TkWinWmCleanup
 #define TkWinWmCleanup(hInstance) \
-	(tkIntPlatStubsPtr->tkWinWmCleanup)(hInstance) /* 40 */
-#endif
-#ifndef TkWinWmFindEmbedAssociation
-#define TkWinWmFindEmbedAssociation(winPtr) \
-	(tkIntPlatStubsPtr->tkWinWmFindEmbedAssociation)(winPtr) /* 41 */
-#endif
-#ifndef TkWinWmStoreEmbedAssociation
-#define TkWinWmStoreEmbedAssociation(winPtr, hwnd) \
-	(tkIntPlatStubsPtr->tkWinWmStoreEmbedAssociation)(winPtr, hwnd) /* 42 */
+	(tkIntPlatStubsPtr->tkWinWmCleanup)(hInstance) /* 33 */
 #endif
 #ifndef TkWinXCleanup
 #define TkWinXCleanup(hInstance) \
-	(tkIntPlatStubsPtr->tkWinXCleanup)(hInstance) /* 43 */
+	(tkIntPlatStubsPtr->tkWinXCleanup)(hInstance) /* 34 */
 #endif
 #ifndef TkWinXInit
 #define TkWinXInit(hInstance) \
-	(tkIntPlatStubsPtr->tkWinXInit)(hInstance) /* 44 */
+	(tkIntPlatStubsPtr->tkWinXInit)(hInstance) /* 35 */
 #endif
 #endif /* __WIN32__ */
 #if !defined(__WIN32__) && !defined(MAC_TCL)
@@ -765,246 +703,245 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkpSetCursor(cursor) \
 	(tkIntPlatStubsPtr->tkpSetCursor)(cursor) /* 11 */
 #endif
-/* Slot 12 is reserved */
 #ifndef TkpWmSetState
 #define TkpWmSetState(winPtr, state) \
-	(tkIntPlatStubsPtr->tkpWmSetState)(winPtr, state) /* 13 */
+	(tkIntPlatStubsPtr->tkpWmSetState)(winPtr, state) /* 12 */
 #endif
 #ifndef TkRectInRegion
 #define TkRectInRegion(rgn, x, y, width, height) \
-	(tkIntPlatStubsPtr->tkRectInRegion)(rgn, x, y, width, height) /* 14 */
+	(tkIntPlatStubsPtr->tkRectInRegion)(rgn, x, y, width, height) /* 13 */
 #endif
 #ifndef TkSetRegion
 #define TkSetRegion(display, gc, rgn) \
-	(tkIntPlatStubsPtr->tkSetRegion)(display, gc, rgn) /* 15 */
+	(tkIntPlatStubsPtr->tkSetRegion)(display, gc, rgn) /* 14 */
 #endif
 #ifndef TkUnionRectWithRegion
 #define TkUnionRectWithRegion(rect, src, dr_return) \
-	(tkIntPlatStubsPtr->tkUnionRectWithRegion)(rect, src, dr_return) /* 16 */
+	(tkIntPlatStubsPtr->tkUnionRectWithRegion)(rect, src, dr_return) /* 15 */
 #endif
 #ifndef HandleWMEvent
 #define HandleWMEvent(theEvent) \
-	(tkIntPlatStubsPtr->handleWMEvent)(theEvent) /* 17 */
+	(tkIntPlatStubsPtr->handleWMEvent)(theEvent) /* 16 */
 #endif
 #ifndef TkAboutDlg
 #define TkAboutDlg() \
-	(tkIntPlatStubsPtr->tkAboutDlg)() /* 18 */
+	(tkIntPlatStubsPtr->tkAboutDlg)() /* 17 */
 #endif
 #ifndef TkCreateMacEventSource
 #define TkCreateMacEventSource() \
-	(tkIntPlatStubsPtr->tkCreateMacEventSource)() /* 19 */
+	(tkIntPlatStubsPtr->tkCreateMacEventSource)() /* 18 */
 #endif
 #ifndef TkFontList
 #define TkFontList(interp, display) \
-	(tkIntPlatStubsPtr->tkFontList)(interp, display) /* 20 */
+	(tkIntPlatStubsPtr->tkFontList)(interp, display) /* 19 */
 #endif
 #ifndef TkGetTransientMaster
 #define TkGetTransientMaster(winPtr) \
-	(tkIntPlatStubsPtr->tkGetTransientMaster)(winPtr) /* 21 */
+	(tkIntPlatStubsPtr->tkGetTransientMaster)(winPtr) /* 20 */
 #endif
 #ifndef TkGenerateButtonEvent
 #define TkGenerateButtonEvent(x, y, window, state) \
-	(tkIntPlatStubsPtr->tkGenerateButtonEvent)(x, y, window, state) /* 22 */
+	(tkIntPlatStubsPtr->tkGenerateButtonEvent)(x, y, window, state) /* 21 */
 #endif
 #ifndef TkGetCharPositions
 #define TkGetCharPositions(font_struct, string, count, buffer) \
-	(tkIntPlatStubsPtr->tkGetCharPositions)(font_struct, string, count, buffer) /* 23 */
+	(tkIntPlatStubsPtr->tkGetCharPositions)(font_struct, string, count, buffer) /* 22 */
 #endif
 #ifndef TkGenWMDestroyEvent
 #define TkGenWMDestroyEvent(tkwin) \
-	(tkIntPlatStubsPtr->tkGenWMDestroyEvent)(tkwin) /* 24 */
+	(tkIntPlatStubsPtr->tkGenWMDestroyEvent)(tkwin) /* 23 */
 #endif
 #ifndef TkGenWMConfigureEvent
 #define TkGenWMConfigureEvent(tkwin, x, y, width, height, flags) \
-	(tkIntPlatStubsPtr->tkGenWMConfigureEvent)(tkwin, x, y, width, height, flags) /* 25 */
+	(tkIntPlatStubsPtr->tkGenWMConfigureEvent)(tkwin, x, y, width, height, flags) /* 24 */
 #endif
 #ifndef TkMacButtonKeyState
 #define TkMacButtonKeyState() \
-	(tkIntPlatStubsPtr->tkMacButtonKeyState)() /* 26 */
+	(tkIntPlatStubsPtr->tkMacButtonKeyState)() /* 25 */
 #endif
 #ifndef TkMacClearMenubarActive
 #define TkMacClearMenubarActive() \
-	(tkIntPlatStubsPtr->tkMacClearMenubarActive)() /* 27 */
+	(tkIntPlatStubsPtr->tkMacClearMenubarActive)() /* 26 */
 #endif
 #ifndef TkMacConvertEvent
 #define TkMacConvertEvent(eventPtr) \
-	(tkIntPlatStubsPtr->tkMacConvertEvent)(eventPtr) /* 28 */
+	(tkIntPlatStubsPtr->tkMacConvertEvent)(eventPtr) /* 27 */
 #endif
 #ifndef TkMacDispatchMenuEvent
 #define TkMacDispatchMenuEvent(menuID, index) \
-	(tkIntPlatStubsPtr->tkMacDispatchMenuEvent)(menuID, index) /* 29 */
+	(tkIntPlatStubsPtr->tkMacDispatchMenuEvent)(menuID, index) /* 28 */
 #endif
 #ifndef TkMacInstallCursor
 #define TkMacInstallCursor(resizeOverride) \
-	(tkIntPlatStubsPtr->tkMacInstallCursor)(resizeOverride) /* 30 */
+	(tkIntPlatStubsPtr->tkMacInstallCursor)(resizeOverride) /* 29 */
 #endif
 #ifndef TkMacConvertTkEvent
 #define TkMacConvertTkEvent(eventPtr, window) \
-	(tkIntPlatStubsPtr->tkMacConvertTkEvent)(eventPtr, window) /* 31 */
+	(tkIntPlatStubsPtr->tkMacConvertTkEvent)(eventPtr, window) /* 30 */
 #endif
 #ifndef TkMacHandleTearoffMenu
 #define TkMacHandleTearoffMenu() \
-	(tkIntPlatStubsPtr->tkMacHandleTearoffMenu)() /* 32 */
+	(tkIntPlatStubsPtr->tkMacHandleTearoffMenu)() /* 31 */
 #endif
 #ifndef tkMacInstallMWConsole
 #define tkMacInstallMWConsole(interp) \
-	(tkIntPlatStubsPtr->tkMacInstallMWConsole)(interp) /* 33 */
+	(tkIntPlatStubsPtr->tkMacInstallMWConsole)(interp) /* 32 */
 #endif
 #ifndef TkMacInvalClipRgns
 #define TkMacInvalClipRgns(winPtr) \
-	(tkIntPlatStubsPtr->tkMacInvalClipRgns)(winPtr) /* 34 */
+	(tkIntPlatStubsPtr->tkMacInvalClipRgns)(winPtr) /* 33 */
 #endif
 #ifndef TkMacDoHLEvent
 #define TkMacDoHLEvent(theEvent) \
-	(tkIntPlatStubsPtr->tkMacDoHLEvent)(theEvent) /* 35 */
+	(tkIntPlatStubsPtr->tkMacDoHLEvent)(theEvent) /* 34 */
 #endif
 #ifndef TkMacFontInfo
 #define TkMacFontInfo(fontId, family, style, size) \
-	(tkIntPlatStubsPtr->tkMacFontInfo)(fontId, family, style, size) /* 36 */
+	(tkIntPlatStubsPtr->tkMacFontInfo)(fontId, family, style, size) /* 35 */
 #endif
 #ifndef TkMacGenerateTime
 #define TkMacGenerateTime() \
-	(tkIntPlatStubsPtr->tkMacGenerateTime)() /* 37 */
+	(tkIntPlatStubsPtr->tkMacGenerateTime)() /* 36 */
 #endif
 #ifndef TkMacGetDrawablePort
 #define TkMacGetDrawablePort(drawable) \
-	(tkIntPlatStubsPtr->tkMacGetDrawablePort)(drawable) /* 38 */
+	(tkIntPlatStubsPtr->tkMacGetDrawablePort)(drawable) /* 37 */
 #endif
 #ifndef TkMacGetScrollbarGrowWindow
 #define TkMacGetScrollbarGrowWindow(winPtr) \
-	(tkIntPlatStubsPtr->tkMacGetScrollbarGrowWindow)(winPtr) /* 39 */
+	(tkIntPlatStubsPtr->tkMacGetScrollbarGrowWindow)(winPtr) /* 38 */
 #endif
 #ifndef TkMacGetXWindow
 #define TkMacGetXWindow(macWinPtr) \
-	(tkIntPlatStubsPtr->tkMacGetXWindow)(macWinPtr) /* 40 */
+	(tkIntPlatStubsPtr->tkMacGetXWindow)(macWinPtr) /* 39 */
 #endif
 #ifndef TkMacGrowToplevel
 #define TkMacGrowToplevel(whichWindow, start) \
-	(tkIntPlatStubsPtr->tkMacGrowToplevel)(whichWindow, start) /* 41 */
+	(tkIntPlatStubsPtr->tkMacGrowToplevel)(whichWindow, start) /* 40 */
 #endif
 #ifndef TkMacHandleMenuSelect
 #define TkMacHandleMenuSelect(mResult, optionKeyPressed) \
-	(tkIntPlatStubsPtr->tkMacHandleMenuSelect)(mResult, optionKeyPressed) /* 42 */
+	(tkIntPlatStubsPtr->tkMacHandleMenuSelect)(mResult, optionKeyPressed) /* 41 */
 #endif
 #ifndef TkMacHaveAppearance
 #define TkMacHaveAppearance() \
-	(tkIntPlatStubsPtr->tkMacHaveAppearance)() /* 43 */
+	(tkIntPlatStubsPtr->tkMacHaveAppearance)() /* 42 */
 #endif
 #ifndef TkMacInitAppleEvents
 #define TkMacInitAppleEvents(interp) \
-	(tkIntPlatStubsPtr->tkMacInitAppleEvents)(interp) /* 44 */
+	(tkIntPlatStubsPtr->tkMacInitAppleEvents)(interp) /* 43 */
 #endif
 #ifndef TkMacInitMenus
 #define TkMacInitMenus(interp) \
-	(tkIntPlatStubsPtr->tkMacInitMenus)(interp) /* 45 */
+	(tkIntPlatStubsPtr->tkMacInitMenus)(interp) /* 44 */
 #endif
 #ifndef TkMacInvalidateWindow
 #define TkMacInvalidateWindow(macWin, flag) \
-	(tkIntPlatStubsPtr->tkMacInvalidateWindow)(macWin, flag) /* 46 */
+	(tkIntPlatStubsPtr->tkMacInvalidateWindow)(macWin, flag) /* 45 */
 #endif
 #ifndef TkMacIsCharacterMissing
 #define TkMacIsCharacterMissing(tkfont, searchChar) \
-	(tkIntPlatStubsPtr->tkMacIsCharacterMissing)(tkfont, searchChar) /* 47 */
+	(tkIntPlatStubsPtr->tkMacIsCharacterMissing)(tkfont, searchChar) /* 46 */
 #endif
 #ifndef TkMacMakeRealWindowExist
 #define TkMacMakeRealWindowExist(winPtr) \
-	(tkIntPlatStubsPtr->tkMacMakeRealWindowExist)(winPtr) /* 48 */
+	(tkIntPlatStubsPtr->tkMacMakeRealWindowExist)(winPtr) /* 47 */
 #endif
 #ifndef TkMacMakeStippleMap
 #define TkMacMakeStippleMap(d1, d2) \
-	(tkIntPlatStubsPtr->tkMacMakeStippleMap)(d1, d2) /* 49 */
+	(tkIntPlatStubsPtr->tkMacMakeStippleMap)(d1, d2) /* 48 */
 #endif
 #ifndef TkMacMenuClick
 #define TkMacMenuClick() \
-	(tkIntPlatStubsPtr->tkMacMenuClick)() /* 50 */
+	(tkIntPlatStubsPtr->tkMacMenuClick)() /* 49 */
 #endif
 #ifndef TkMacRegisterOffScreenWindow
 #define TkMacRegisterOffScreenWindow(window, portPtr) \
-	(tkIntPlatStubsPtr->tkMacRegisterOffScreenWindow)(window, portPtr) /* 51 */
+	(tkIntPlatStubsPtr->tkMacRegisterOffScreenWindow)(window, portPtr) /* 50 */
 #endif
 #ifndef TkMacResizable
 #define TkMacResizable(winPtr) \
-	(tkIntPlatStubsPtr->tkMacResizable)(winPtr) /* 52 */
+	(tkIntPlatStubsPtr->tkMacResizable)(winPtr) /* 51 */
 #endif
 #ifndef TkMacSetEmbedRgn
 #define TkMacSetEmbedRgn(winPtr, rgn) \
-	(tkIntPlatStubsPtr->tkMacSetEmbedRgn)(winPtr, rgn) /* 53 */
+	(tkIntPlatStubsPtr->tkMacSetEmbedRgn)(winPtr, rgn) /* 52 */
 #endif
 #ifndef TkMacSetHelpMenuItemCount
 #define TkMacSetHelpMenuItemCount() \
-	(tkIntPlatStubsPtr->tkMacSetHelpMenuItemCount)() /* 54 */
+	(tkIntPlatStubsPtr->tkMacSetHelpMenuItemCount)() /* 53 */
 #endif
 #ifndef TkMacSetScrollbarGrow
 #define TkMacSetScrollbarGrow(winPtr, flag) \
-	(tkIntPlatStubsPtr->tkMacSetScrollbarGrow)(winPtr, flag) /* 55 */
+	(tkIntPlatStubsPtr->tkMacSetScrollbarGrow)(winPtr, flag) /* 54 */
 #endif
 #ifndef TkMacSetUpClippingRgn
 #define TkMacSetUpClippingRgn(drawable) \
-	(tkIntPlatStubsPtr->tkMacSetUpClippingRgn)(drawable) /* 56 */
+	(tkIntPlatStubsPtr->tkMacSetUpClippingRgn)(drawable) /* 55 */
 #endif
 #ifndef TkMacSetUpGraphicsPort
 #define TkMacSetUpGraphicsPort(gc) \
-	(tkIntPlatStubsPtr->tkMacSetUpGraphicsPort)(gc) /* 57 */
+	(tkIntPlatStubsPtr->tkMacSetUpGraphicsPort)(gc) /* 56 */
 #endif
 #ifndef TkMacUpdateClipRgn
 #define TkMacUpdateClipRgn(winPtr) \
-	(tkIntPlatStubsPtr->tkMacUpdateClipRgn)(winPtr) /* 58 */
+	(tkIntPlatStubsPtr->tkMacUpdateClipRgn)(winPtr) /* 57 */
 #endif
 #ifndef TkMacUnregisterMacWindow
 #define TkMacUnregisterMacWindow(portPtr) \
-	(tkIntPlatStubsPtr->tkMacUnregisterMacWindow)(portPtr) /* 59 */
+	(tkIntPlatStubsPtr->tkMacUnregisterMacWindow)(portPtr) /* 58 */
 #endif
 #ifndef TkMacUseMenuID
 #define TkMacUseMenuID(macID) \
-	(tkIntPlatStubsPtr->tkMacUseMenuID)(macID) /* 60 */
+	(tkIntPlatStubsPtr->tkMacUseMenuID)(macID) /* 59 */
 #endif
 #ifndef TkMacVisableClipRgn
 #define TkMacVisableClipRgn(winPtr) \
-	(tkIntPlatStubsPtr->tkMacVisableClipRgn)(winPtr) /* 61 */
+	(tkIntPlatStubsPtr->tkMacVisableClipRgn)(winPtr) /* 60 */
 #endif
 #ifndef TkMacWinBounds
 #define TkMacWinBounds(winPtr, geometry) \
-	(tkIntPlatStubsPtr->tkMacWinBounds)(winPtr, geometry) /* 62 */
+	(tkIntPlatStubsPtr->tkMacWinBounds)(winPtr, geometry) /* 61 */
 #endif
 #ifndef TkMacWindowOffset
 #define TkMacWindowOffset(wRef, xOffset, yOffset) \
-	(tkIntPlatStubsPtr->tkMacWindowOffset)(wRef, xOffset, yOffset) /* 63 */
+	(tkIntPlatStubsPtr->tkMacWindowOffset)(wRef, xOffset, yOffset) /* 62 */
 #endif
 #ifndef TkResumeClipboard
 #define TkResumeClipboard() \
-	(tkIntPlatStubsPtr->tkResumeClipboard)() /* 64 */
+	(tkIntPlatStubsPtr->tkResumeClipboard)() /* 63 */
 #endif
 #ifndef TkSetMacColor
 #define TkSetMacColor(pixel, macColor) \
-	(tkIntPlatStubsPtr->tkSetMacColor)(pixel, macColor) /* 65 */
+	(tkIntPlatStubsPtr->tkSetMacColor)(pixel, macColor) /* 64 */
 #endif
 #ifndef TkSetWMName
 #define TkSetWMName(winPtr, titleUid) \
-	(tkIntPlatStubsPtr->tkSetWMName)(winPtr, titleUid) /* 66 */
+	(tkIntPlatStubsPtr->tkSetWMName)(winPtr, titleUid) /* 65 */
 #endif
 #ifndef TkSuspendClipboard
 #define TkSuspendClipboard() \
-	(tkIntPlatStubsPtr->tkSuspendClipboard)() /* 67 */
+	(tkIntPlatStubsPtr->tkSuspendClipboard)() /* 66 */
 #endif
 #ifndef TkWMGrowToplevel
 #define TkWMGrowToplevel(whichWindow, start) \
-	(tkIntPlatStubsPtr->tkWMGrowToplevel)(whichWindow, start) /* 68 */
+	(tkIntPlatStubsPtr->tkWMGrowToplevel)(whichWindow, start) /* 67 */
 #endif
 #ifndef TkMacZoomToplevel
 #define TkMacZoomToplevel(whichWindow, where, zoomPart) \
-	(tkIntPlatStubsPtr->tkMacZoomToplevel)(whichWindow, where, zoomPart) /* 69 */
+	(tkIntPlatStubsPtr->tkMacZoomToplevel)(whichWindow, where, zoomPart) /* 68 */
 #endif
 #ifndef Tk_TopCoordsToWindow
 #define Tk_TopCoordsToWindow(tkwin, rootX, rootY, newX, newY) \
-	(tkIntPlatStubsPtr->tk_TopCoordsToWindow)(tkwin, rootX, rootY, newX, newY) /* 70 */
+	(tkIntPlatStubsPtr->tk_TopCoordsToWindow)(tkwin, rootX, rootY, newX, newY) /* 69 */
 #endif
 #ifndef TkMacContainerId
 #define TkMacContainerId(winPtr) \
-	(tkIntPlatStubsPtr->tkMacContainerId)(winPtr) /* 71 */
+	(tkIntPlatStubsPtr->tkMacContainerId)(winPtr) /* 70 */
 #endif
 #ifndef TkMacGetHostToplevel
 #define TkMacGetHostToplevel(winPtr) \
-	(tkIntPlatStubsPtr->tkMacGetHostToplevel)(winPtr) /* 72 */
+	(tkIntPlatStubsPtr->tkMacGetHostToplevel)(winPtr) /* 71 */
 #endif
 #endif /* MAC_TCL */
 
diff --git a/generic/tkIntPlatStubs.c b/generic/tkIntPlatStubs.c
index d65ddd7..ec62746 100644
--- a/generic/tkIntPlatStubs.c
+++ b/generic/tkIntPlatStubs.c
@@ -7,11 +7,16 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntPlatStubs.c,v 1.1.2.3 1999/03/06 02:23:17 redman Exp $
+ * RCS: @(#) $Id: tkIntPlatStubs.c,v 1.1.2.4 1999/03/07 00:15:44 redman Exp $
  */
 
 #include "tkInt.h"
 #include "tkPort.h"
+
+#ifdef __WIN32__
+#include "tkWinInt.h"
+#endif
+
 #include "tkIntPlatDecls.h"
 
 /*
@@ -114,8 +119,7 @@ TkpScanWindowId(interp, string, idPtr)
     return (tkIntPlatStubsPtr->tkpScanWindowId)(interp, string, idPtr);
 }
 
-/* Slot 10 is reserved */
-/* Slot 11 */
+/* Slot 10 */
 void
 TkpSetCapture(winPtr)
     TkWindow * winPtr;
@@ -123,7 +127,7 @@ TkpSetCapture(winPtr)
     (tkIntPlatStubsPtr->tkpSetCapture)(winPtr);
 }
 
-/* Slot 12 */
+/* Slot 11 */
 void
 TkpSetCursor(cursor)
     TkpCursor cursor;
@@ -131,7 +135,7 @@ TkpSetCursor(cursor)
     (tkIntPlatStubsPtr->tkpSetCursor)(cursor);
 }
 
-/* Slot 13 */
+/* Slot 12 */
 void
 TkpWmSetState(winPtr, state)
     TkWindow * winPtr;
@@ -140,7 +144,7 @@ TkpWmSetState(winPtr, state)
     (tkIntPlatStubsPtr->tkpWmSetState)(winPtr, state);
 }
 
-/* Slot 14 */
+/* Slot 13 */
 int
 TkRectInRegion(rgn, x, y, width, height)
     TkRegion rgn;
@@ -152,7 +156,7 @@ TkRectInRegion(rgn, x, y, width, height)
     return (tkIntPlatStubsPtr->tkRectInRegion)(rgn, x, y, width, height);
 }
 
-/* Slot 15 */
+/* Slot 14 */
 void
 TkSetPixmapColormap(pixmap, colormap)
     Pixmap pixmap;
@@ -161,7 +165,7 @@ TkSetPixmapColormap(pixmap, colormap)
     (tkIntPlatStubsPtr->tkSetPixmapColormap)(pixmap, colormap);
 }
 
-/* Slot 16 */
+/* Slot 15 */
 void
 TkSetRegion(display, gc, rgn)
     Display* display;
@@ -171,7 +175,7 @@ TkSetRegion(display, gc, rgn)
     (tkIntPlatStubsPtr->tkSetRegion)(display, gc, rgn);
 }
 
-/* Slot 17 */
+/* Slot 16 */
 void
 TkUnionRectWithRegion(rect, src, dr_return)
     XRectangle* rect;
@@ -181,15 +185,14 @@ TkUnionRectWithRegion(rect, src, dr_return)
     (tkIntPlatStubsPtr->tkUnionRectWithRegion)(rect, src, dr_return);
 }
 
-/* Slot 18 */
+/* Slot 17 */
 void
 TkWinCancelMouseTimer()
 {
     (tkIntPlatStubsPtr->tkWinCancelMouseTimer)();
 }
 
-/* Slot 19 is reserved */
-/* Slot 20 */
+/* Slot 18 */
 void
 TkWinClipboardRender(dispPtr, format)
     TkDisplay * dispPtr;
@@ -198,7 +201,7 @@ TkWinClipboardRender(dispPtr, format)
     (tkIntPlatStubsPtr->tkWinClipboardRender)(dispPtr, format);
 }
 
-/* Slot 21 */
+/* Slot 19 */
 LRESULT
 TkWinEmbeddedEventProc(hwnd, message, wParam, lParam)
     HWND hwnd;
@@ -209,7 +212,7 @@ TkWinEmbeddedEventProc(hwnd, message, wParam, lParam)
     return (tkIntPlatStubsPtr->tkWinEmbeddedEventProc)(hwnd, message, wParam, lParam);
 }
 
-/* Slot 22 */
+/* Slot 20 */
 void
 TkWinFillRect(dc, x, y, width, height, pixel)
     HDC dc;
@@ -222,7 +225,7 @@ TkWinFillRect(dc, x, y, width, height, pixel)
     (tkIntPlatStubsPtr->tkWinFillRect)(dc, x, y, width, height, pixel);
 }
 
-/* Slot 23 */
+/* Slot 21 */
 COLORREF
 TkWinGetBorderPixels(tkwin, border, which)
     Tk_Window tkwin;
@@ -232,7 +235,7 @@ TkWinGetBorderPixels(tkwin, border, which)
     return (tkIntPlatStubsPtr->tkWinGetBorderPixels)(tkwin, border, which);
 }
 
-/* Slot 24 */
+/* Slot 22 */
 HDC
 TkWinGetDrawableDC(display, d, state)
     Display * display;
@@ -242,21 +245,21 @@ TkWinGetDrawableDC(display, d, state)
     return (tkIntPlatStubsPtr->tkWinGetDrawableDC)(display, d, state);
 }
 
-/* Slot 25 */
+/* Slot 23 */
 int
 TkWinGetModifierState()
 {
     return (tkIntPlatStubsPtr->tkWinGetModifierState)();
 }
 
-/* Slot 26 */
+/* Slot 24 */
 HPALETTE
 TkWinGetSystemPalette()
 {
     return (tkIntPlatStubsPtr->tkWinGetSystemPalette)();
 }
 
-/* Slot 27 */
+/* Slot 25 */
 HWND
 TkWinGetWrapperWindow(tkwin)
     Tk_Window tkwin;
@@ -264,7 +267,7 @@ TkWinGetWrapperWindow(tkwin)
     return (tkIntPlatStubsPtr->tkWinGetWrapperWindow)(tkwin);
 }
 
-/* Slot 28 */
+/* Slot 26 */
 int
 TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult)
     HWND * phwnd;
@@ -276,7 +279,7 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult)
     return (tkIntPlatStubsPtr->tkWinHandleMenuEvent)(phwnd, pMessage, pwParam, plParam, plResult);
 }
 
-/* Slot 29 */
+/* Slot 27 */
 int
 TkWinIndexOfColor(colorPtr)
     XColor * colorPtr;
@@ -284,43 +287,7 @@ TkWinIndexOfColor(colorPtr)
     return (tkIntPlatStubsPtr->tkWinIndexOfColor)(colorPtr);
 }
 
-/* Slot 30 */
-void
-TkWinPointerDeadWindow(winPtr)
-    TkWindow * winPtr;
-{
-    (tkIntPlatStubsPtr->tkWinPointerDeadWindow)(winPtr);
-}
-
-/* Slot 31 */
-void
-TkWinPointerEvent(hwnd, x, y)
-    HWND hwnd;
-    int x;
-    int y;
-{
-    (tkIntPlatStubsPtr->tkWinPointerEvent)(hwnd, x, y);
-}
-
-/* Slot 32 */
-void
-TkWinPointerInit()
-{
-    (tkIntPlatStubsPtr->tkWinPointerInit)();
-}
-
-/* Slot 33 */
-LRESULT
-TkWinReflectMessage(hwnd, message, wParam, lParam)
-    HWND hwnd;
-    UINT message;
-    WPARAM wParam;
-    LPARAM lParam;
-{
-    return (tkIntPlatStubsPtr->tkWinReflectMessage)(hwnd, message, wParam, lParam);
-}
-
-/* Slot 34 */
+/* Slot 28 */
 void
 TkWinReleaseDrawableDC(d, hdc, state)
     Drawable d;
@@ -330,7 +297,7 @@ TkWinReleaseDrawableDC(d, hdc, state)
     (tkIntPlatStubsPtr->tkWinReleaseDrawableDC)(d, hdc, state);
 }
 
-/* Slot 35 */
+/* Slot 29 */
 LRESULT
 TkWinResendEvent(wndproc, hwnd, eventPtr)
     WNDPROC wndproc;
@@ -340,7 +307,7 @@ TkWinResendEvent(wndproc, hwnd, eventPtr)
     return (tkIntPlatStubsPtr->tkWinResendEvent)(wndproc, hwnd, eventPtr);
 }
 
-/* Slot 36 */
+/* Slot 30 */
 HPALETTE
 TkWinSelectPalette(dc, colormap)
     HDC dc;
@@ -349,7 +316,7 @@ TkWinSelectPalette(dc, colormap)
     return (tkIntPlatStubsPtr->tkWinSelectPalette)(dc, colormap);
 }
 
-/* Slot 37 */
+/* Slot 31 */
 void
 TkWinSetMenu(tkwin, hMenu)
     Tk_Window tkwin;
@@ -358,7 +325,7 @@ TkWinSetMenu(tkwin, hMenu)
     (tkIntPlatStubsPtr->tkWinSetMenu)(tkwin, hMenu);
 }
 
-/* Slot 38 */
+/* Slot 32 */
 void
 TkWinSetWindowPos(hwnd, siblingHwnd, pos)
     HWND hwnd;
@@ -368,15 +335,7 @@ TkWinSetWindowPos(hwnd, siblingHwnd, pos)
     (tkIntPlatStubsPtr->tkWinSetWindowPos)(hwnd, siblingHwnd, pos);
 }
 
-/* Slot 39 */
-void
-TkWinUpdateCursor(winPtr)
-    TkWindow * winPtr;
-{
-    (tkIntPlatStubsPtr->tkWinUpdateCursor)(winPtr);
-}
-
-/* Slot 40 */
+/* Slot 33 */
 void
 TkWinWmCleanup(hInstance)
     HINSTANCE hInstance;
@@ -384,24 +343,7 @@ TkWinWmCleanup(hInstance)
     (tkIntPlatStubsPtr->tkWinWmCleanup)(hInstance);
 }
 
-/* Slot 41 */
-HWND
-TkWinWmFindEmbedAssociation(winPtr)
-    TkWindow * winPtr;
-{
-    return (tkIntPlatStubsPtr->tkWinWmFindEmbedAssociation)(winPtr);
-}
-
-/* Slot 42 */
-void
-TkWinWmStoreEmbedAssociation(winPtr, hwnd)
-    TkWindow * winPtr;
-    HWND hwnd;
-{
-    (tkIntPlatStubsPtr->tkWinWmStoreEmbedAssociation)(winPtr, hwnd);
-}
-
-/* Slot 43 */
+/* Slot 34 */
 void
 TkWinXCleanup(hInstance)
     HINSTANCE hInstance;
@@ -409,7 +351,7 @@ TkWinXCleanup(hInstance)
     (tkIntPlatStubsPtr->tkWinXCleanup)(hInstance);
 }
 
-/* Slot 44 */
+/* Slot 35 */
 void
 TkWinXInit(hInstance)
     HINSTANCE hInstance;
@@ -588,8 +530,7 @@ TkpSetCursor(cursor)
     (tkIntPlatStubsPtr->tkpSetCursor)(cursor);
 }
 
-/* Slot 12 is reserved */
-/* Slot 13 */
+/* Slot 12 */
 void
 TkpWmSetState(winPtr, state)
     TkWindow * winPtr;
@@ -598,7 +539,7 @@ TkpWmSetState(winPtr, state)
     (tkIntPlatStubsPtr->tkpWmSetState)(winPtr, state);
 }
 
-/* Slot 14 */
+/* Slot 13 */
 int
 TkRectInRegion(rgn, x, y, width, height)
     TkRegion rgn;
@@ -610,7 +551,7 @@ TkRectInRegion(rgn, x, y, width, height)
     return (tkIntPlatStubsPtr->tkRectInRegion)(rgn, x, y, width, height);
 }
 
-/* Slot 15 */
+/* Slot 14 */
 void
 TkSetRegion(display, gc, rgn)
     Display* display;
@@ -620,7 +561,7 @@ TkSetRegion(display, gc, rgn)
     (tkIntPlatStubsPtr->tkSetRegion)(display, gc, rgn);
 }
 
-/* Slot 16 */
+/* Slot 15 */
 void
 TkUnionRectWithRegion(rect, src, dr_return)
     XRectangle* rect;
@@ -630,7 +571,7 @@ TkUnionRectWithRegion(rect, src, dr_return)
     (tkIntPlatStubsPtr->tkUnionRectWithRegion)(rect, src, dr_return);
 }
 
-/* Slot 17 */
+/* Slot 16 */
 int
 HandleWMEvent(theEvent)
     EventRecord * theEvent;
@@ -638,21 +579,21 @@ HandleWMEvent(theEvent)
     return (tkIntPlatStubsPtr->handleWMEvent)(theEvent);
 }
 
-/* Slot 18 */
+/* Slot 17 */
 void
 TkAboutDlg()
 {
     (tkIntPlatStubsPtr->tkAboutDlg)();
 }
 
-/* Slot 19 */
+/* Slot 18 */
 void
 TkCreateMacEventSource()
 {
     (tkIntPlatStubsPtr->tkCreateMacEventSource)();
 }
 
-/* Slot 20 */
+/* Slot 19 */
 void
 TkFontList(interp, display)
     Tcl_Interp * interp;
@@ -661,7 +602,7 @@ TkFontList(interp, display)
     (tkIntPlatStubsPtr->tkFontList)(interp, display);
 }
 
-/* Slot 21 */
+/* Slot 20 */
 Window
 TkGetTransientMaster(winPtr)
     TkWindow * winPtr;
@@ -669,7 +610,7 @@ TkGetTransientMaster(winPtr)
     return (tkIntPlatStubsPtr->tkGetTransientMaster)(winPtr);
 }
 
-/* Slot 22 */
+/* Slot 21 */
 int
 TkGenerateButtonEvent(x, y, window, state)
     int x;
@@ -680,7 +621,7 @@ TkGenerateButtonEvent(x, y, window, state)
     return (tkIntPlatStubsPtr->tkGenerateButtonEvent)(x, y, window, state);
 }
 
-/* Slot 23 */
+/* Slot 22 */
 int
 TkGetCharPositions(font_struct, string, count, buffer)
     XFontStruct * font_struct;
@@ -691,7 +632,7 @@ TkGetCharPositions(font_struct, string, count, buffer)
     return (tkIntPlatStubsPtr->tkGetCharPositions)(font_struct, string, count, buffer);
 }
 
-/* Slot 24 */
+/* Slot 23 */
 void
 TkGenWMDestroyEvent(tkwin)
     Tk_Window tkwin;
@@ -699,7 +640,7 @@ TkGenWMDestroyEvent(tkwin)
     (tkIntPlatStubsPtr->tkGenWMDestroyEvent)(tkwin);
 }
 
-/* Slot 25 */
+/* Slot 24 */
 void
 TkGenWMConfigureEvent(tkwin, x, y, width, height, flags)
     Tk_Window tkwin;
@@ -712,21 +653,21 @@ TkGenWMConfigureEvent(tkwin, x, y, width, height, flags)
     (tkIntPlatStubsPtr->tkGenWMConfigureEvent)(tkwin, x, y, width, height, flags);
 }
 
-/* Slot 26 */
+/* Slot 25 */
 unsigned int
 TkMacButtonKeyState()
 {
     return (tkIntPlatStubsPtr->tkMacButtonKeyState)();
 }
 
-/* Slot 27 */
+/* Slot 26 */
 void
 TkMacClearMenubarActive()
 {
     (tkIntPlatStubsPtr->tkMacClearMenubarActive)();
 }
 
-/* Slot 28 */
+/* Slot 27 */
 int
 TkMacConvertEvent(eventPtr)
     EventRecord * eventPtr;
@@ -734,7 +675,7 @@ TkMacConvertEvent(eventPtr)
     return (tkIntPlatStubsPtr->tkMacConvertEvent)(eventPtr);
 }
 
-/* Slot 29 */
+/* Slot 28 */
 int
 TkMacDispatchMenuEvent(menuID, index)
     int menuID;
@@ -743,7 +684,7 @@ TkMacDispatchMenuEvent(menuID, index)
     return (tkIntPlatStubsPtr->tkMacDispatchMenuEvent)(menuID, index);
 }
 
-/* Slot 30 */
+/* Slot 29 */
 void
 TkMacInstallCursor(resizeOverride)
     int resizeOverride;
@@ -751,7 +692,7 @@ TkMacInstallCursor(resizeOverride)
     (tkIntPlatStubsPtr->tkMacInstallCursor)(resizeOverride);
 }
 
-/* Slot 31 */
+/* Slot 30 */
 int
 TkMacConvertTkEvent(eventPtr, window)
     EventRecord * eventPtr;
@@ -760,14 +701,14 @@ TkMacConvertTkEvent(eventPtr, window)
     return (tkIntPlatStubsPtr->tkMacConvertTkEvent)(eventPtr, window);
 }
 
-/* Slot 32 */
+/* Slot 31 */
 void
 TkMacHandleTearoffMenu()
 {
     (tkIntPlatStubsPtr->tkMacHandleTearoffMenu)();
 }
 
-/* Slot 33 */
+/* Slot 32 */
 void
 tkMacInstallMWConsole(interp)
     Tcl_Interp * interp;
@@ -775,7 +716,7 @@ tkMacInstallMWConsole(interp)
     (tkIntPlatStubsPtr->tkMacInstallMWConsole)(interp);
 }
 
-/* Slot 34 */
+/* Slot 33 */
 void
 TkMacInvalClipRgns(winPtr)
     TkWindow * winPtr;
@@ -783,7 +724,7 @@ TkMacInvalClipRgns(winPtr)
     (tkIntPlatStubsPtr->tkMacInvalClipRgns)(winPtr);
 }
 
-/* Slot 35 */
+/* Slot 34 */
 void
 TkMacDoHLEvent(theEvent)
     EventRecord * theEvent;
@@ -791,7 +732,7 @@ TkMacDoHLEvent(theEvent)
     (tkIntPlatStubsPtr->tkMacDoHLEvent)(theEvent);
 }
 
-/* Slot 36 */
+/* Slot 35 */
 void
 TkMacFontInfo(fontId, family, style, size)
     Font fontId;
@@ -802,14 +743,14 @@ TkMacFontInfo(fontId, family, style, size)
     (tkIntPlatStubsPtr->tkMacFontInfo)(fontId, family, style, size);
 }
 
-/* Slot 37 */
+/* Slot 36 */
 Time
 TkMacGenerateTime()
 {
     return (tkIntPlatStubsPtr->tkMacGenerateTime)();
 }
 
-/* Slot 38 */
+/* Slot 37 */
 GWorldPtr
 TkMacGetDrawablePort(drawable)
     Drawable drawable;
@@ -817,7 +758,7 @@ TkMacGetDrawablePort(drawable)
     return (tkIntPlatStubsPtr->tkMacGetDrawablePort)(drawable);
 }
 
-/* Slot 39 */
+/* Slot 38 */
 TkWindow *
 TkMacGetScrollbarGrowWindow(winPtr)
     TkWindow * winPtr;
@@ -825,7 +766,7 @@ TkMacGetScrollbarGrowWindow(winPtr)
     return (tkIntPlatStubsPtr->tkMacGetScrollbarGrowWindow)(winPtr);
 }
 
-/* Slot 40 */
+/* Slot 39 */
 Window
 TkMacGetXWindow(macWinPtr)
     WindowRef macWinPtr;
@@ -833,7 +774,7 @@ TkMacGetXWindow(macWinPtr)
     return (tkIntPlatStubsPtr->tkMacGetXWindow)(macWinPtr);
 }
 
-/* Slot 41 */
+/* Slot 40 */
 int
 TkMacGrowToplevel(whichWindow, start)
     WindowRef whichWindow;
@@ -842,7 +783,7 @@ TkMacGrowToplevel(whichWindow, start)
     return (tkIntPlatStubsPtr->tkMacGrowToplevel)(whichWindow, start);
 }
 
-/* Slot 42 */
+/* Slot 41 */
 void
 TkMacHandleMenuSelect(mResult, optionKeyPressed)
     long mResult;
@@ -851,14 +792,14 @@ TkMacHandleMenuSelect(mResult, optionKeyPressed)
     (tkIntPlatStubsPtr->tkMacHandleMenuSelect)(mResult, optionKeyPressed);
 }
 
-/* Slot 43 */
+/* Slot 42 */
 int
 TkMacHaveAppearance()
 {
     return (tkIntPlatStubsPtr->tkMacHaveAppearance)();
 }
 
-/* Slot 44 */
+/* Slot 43 */
 void
 TkMacInitAppleEvents(interp)
     Tcl_Interp * interp;
@@ -866,7 +807,7 @@ TkMacInitAppleEvents(interp)
     (tkIntPlatStubsPtr->tkMacInitAppleEvents)(interp);
 }
 
-/* Slot 45 */
+/* Slot 44 */
 void
 TkMacInitMenus(interp)
     Tcl_Interp * interp;
@@ -874,7 +815,7 @@ TkMacInitMenus(interp)
     (tkIntPlatStubsPtr->tkMacInitMenus)(interp);
 }
 
-/* Slot 46 */
+/* Slot 45 */
 void
 TkMacInvalidateWindow(macWin, flag)
     MacDrawable * macWin;
@@ -883,7 +824,7 @@ TkMacInvalidateWindow(macWin, flag)
     (tkIntPlatStubsPtr->tkMacInvalidateWindow)(macWin, flag);
 }
 
-/* Slot 47 */
+/* Slot 46 */
 int
 TkMacIsCharacterMissing(tkfont, searchChar)
     Tk_Font tkfont;
@@ -892,7 +833,7 @@ TkMacIsCharacterMissing(tkfont, searchChar)
     return (tkIntPlatStubsPtr->tkMacIsCharacterMissing)(tkfont, searchChar);
 }
 
-/* Slot 48 */
+/* Slot 47 */
 void
 TkMacMakeRealWindowExist(winPtr)
     TkWindow * winPtr;
@@ -900,7 +841,7 @@ TkMacMakeRealWindowExist(winPtr)
     (tkIntPlatStubsPtr->tkMacMakeRealWindowExist)(winPtr);
 }
 
-/* Slot 49 */
+/* Slot 48 */
 BitMapPtr
 TkMacMakeStippleMap(d1, d2)
     Drawable d1;
@@ -909,14 +850,14 @@ TkMacMakeStippleMap(d1, d2)
     return (tkIntPlatStubsPtr->tkMacMakeStippleMap)(d1, d2);
 }
 
-/* Slot 50 */
+/* Slot 49 */
 void
 TkMacMenuClick()
 {
     (tkIntPlatStubsPtr->tkMacMenuClick)();
 }
 
-/* Slot 51 */
+/* Slot 50 */
 void
 TkMacRegisterOffScreenWindow(window, portPtr)
     Window window;
@@ -925,7 +866,7 @@ TkMacRegisterOffScreenWindow(window, portPtr)
     (tkIntPlatStubsPtr->tkMacRegisterOffScreenWindow)(window, portPtr);
 }
 
-/* Slot 52 */
+/* Slot 51 */
 int
 TkMacResizable(winPtr)
     TkWindow * winPtr;
@@ -933,7 +874,7 @@ TkMacResizable(winPtr)
     return (tkIntPlatStubsPtr->tkMacResizable)(winPtr);
 }
 
-/* Slot 53 */
+/* Slot 52 */
 void
 TkMacSetEmbedRgn(winPtr, rgn)
     TkWindow * winPtr;
@@ -942,14 +883,14 @@ TkMacSetEmbedRgn(winPtr, rgn)
     (tkIntPlatStubsPtr->tkMacSetEmbedRgn)(winPtr, rgn);
 }
 
-/* Slot 54 */
+/* Slot 53 */
 void
 TkMacSetHelpMenuItemCount()
 {
     (tkIntPlatStubsPtr->tkMacSetHelpMenuItemCount)();
 }
 
-/* Slot 55 */
+/* Slot 54 */
 void
 TkMacSetScrollbarGrow(winPtr, flag)
     TkWindow * winPtr;
@@ -958,7 +899,7 @@ TkMacSetScrollbarGrow(winPtr, flag)
     (tkIntPlatStubsPtr->tkMacSetScrollbarGrow)(winPtr, flag);
 }
 
-/* Slot 56 */
+/* Slot 55 */
 void
 TkMacSetUpClippingRgn(drawable)
     Drawable drawable;
@@ -966,7 +907,7 @@ TkMacSetUpClippingRgn(drawable)
     (tkIntPlatStubsPtr->tkMacSetUpClippingRgn)(drawable);
 }
 
-/* Slot 57 */
+/* Slot 56 */
 void
 TkMacSetUpGraphicsPort(gc)
     GC gc;
@@ -974,7 +915,7 @@ TkMacSetUpGraphicsPort(gc)
     (tkIntPlatStubsPtr->tkMacSetUpGraphicsPort)(gc);
 }
 
-/* Slot 58 */
+/* Slot 57 */
 void
 TkMacUpdateClipRgn(winPtr)
     TkWindow * winPtr;
@@ -982,7 +923,7 @@ TkMacUpdateClipRgn(winPtr)
     (tkIntPlatStubsPtr->tkMacUpdateClipRgn)(winPtr);
 }
 
-/* Slot 59 */
+/* Slot 58 */
 void
 TkMacUnregisterMacWindow(portPtr)
     GWorldPtr portPtr;
@@ -990,7 +931,7 @@ TkMacUnregisterMacWindow(portPtr)
     (tkIntPlatStubsPtr->tkMacUnregisterMacWindow)(portPtr);
 }
 
-/* Slot 60 */
+/* Slot 59 */
 int
 TkMacUseMenuID(macID)
     short macID;
@@ -998,7 +939,7 @@ TkMacUseMenuID(macID)
     return (tkIntPlatStubsPtr->tkMacUseMenuID)(macID);
 }
 
-/* Slot 61 */
+/* Slot 60 */
 RgnHandle
 TkMacVisableClipRgn(winPtr)
     TkWindow * winPtr;
@@ -1006,7 +947,7 @@ TkMacVisableClipRgn(winPtr)
     return (tkIntPlatStubsPtr->tkMacVisableClipRgn)(winPtr);
 }
 
-/* Slot 62 */
+/* Slot 61 */
 void
 TkMacWinBounds(winPtr, geometry)
     TkWindow * winPtr;
@@ -1015,7 +956,7 @@ TkMacWinBounds(winPtr, geometry)
     (tkIntPlatStubsPtr->tkMacWinBounds)(winPtr, geometry);
 }
 
-/* Slot 63 */
+/* Slot 62 */
 void
 TkMacWindowOffset(wRef, xOffset, yOffset)
     WindowRef wRef;
@@ -1025,14 +966,14 @@ TkMacWindowOffset(wRef, xOffset, yOffset)
     (tkIntPlatStubsPtr->tkMacWindowOffset)(wRef, xOffset, yOffset);
 }
 
-/* Slot 64 */
+/* Slot 63 */
 void
 TkResumeClipboard()
 {
     (tkIntPlatStubsPtr->tkResumeClipboard)();
 }
 
-/* Slot 65 */
+/* Slot 64 */
 int
 TkSetMacColor(pixel, macColor)
     unsigned long pixel;
@@ -1041,7 +982,7 @@ TkSetMacColor(pixel, macColor)
     return (tkIntPlatStubsPtr->tkSetMacColor)(pixel, macColor);
 }
 
-/* Slot 66 */
+/* Slot 65 */
 void
 TkSetWMName(winPtr, titleUid)
     TkWindow * winPtr;
@@ -1050,14 +991,14 @@ TkSetWMName(winPtr, titleUid)
     (tkIntPlatStubsPtr->tkSetWMName)(winPtr, titleUid);
 }
 
-/* Slot 67 */
+/* Slot 66 */
 void
 TkSuspendClipboard()
 {
     (tkIntPlatStubsPtr->tkSuspendClipboard)();
 }
 
-/* Slot 68 */
+/* Slot 67 */
 int
 TkWMGrowToplevel(whichWindow, start)
     WindowRef whichWindow;
@@ -1066,7 +1007,7 @@ TkWMGrowToplevel(whichWindow, start)
     return (tkIntPlatStubsPtr->tkWMGrowToplevel)(whichWindow, start);
 }
 
-/* Slot 69 */
+/* Slot 68 */
 int
 TkMacZoomToplevel(whichWindow, where, zoomPart)
     WindowPtr whichWindow;
@@ -1076,7 +1017,7 @@ TkMacZoomToplevel(whichWindow, where, zoomPart)
     return (tkIntPlatStubsPtr->tkMacZoomToplevel)(whichWindow, where, zoomPart);
 }
 
-/* Slot 70 */
+/* Slot 69 */
 Tk_Window
 Tk_TopCoordsToWindow(tkwin, rootX, rootY, newX, newY)
     Tk_Window tkwin;
@@ -1088,7 +1029,7 @@ Tk_TopCoordsToWindow(tkwin, rootX, rootY, newX, newY)
     return (tkIntPlatStubsPtr->tk_TopCoordsToWindow)(tkwin, rootX, rootY, newX, newY);
 }
 
-/* Slot 71 */
+/* Slot 70 */
 MacDrawable *
 TkMacContainerId(winPtr)
     TkWindow * winPtr;
@@ -1096,7 +1037,7 @@ TkMacContainerId(winPtr)
     return (tkIntPlatStubsPtr->tkMacContainerId)(winPtr);
 }
 
-/* Slot 72 */
+/* Slot 71 */
 MacDrawable *
 TkMacGetHostToplevel(winPtr)
     TkWindow * winPtr;
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 3d1639e..8e0e46a 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.1.2.1 1999/03/06 00:08:05 redman Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.1.2.2 1999/03/07 00:15:44 redman Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
@@ -274,275 +274,174 @@ EXTERN void		TkPutImage _ANSI_ARGS_((unsigned long * colors,
 				unsigned int height));
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
-/* Slot 0 is reserved */
-/* Slot 1 is reserved */
-/* Slot 2 is reserved */
-/* Slot 3 is reserved */
-/* Slot 4 is reserved */
-/* Slot 5 is reserved */
-/* Slot 6 is reserved */
-/* Slot 7 is reserved */
-/* Slot 8 is reserved */
-/* Slot 9 is reserved */
-/* Slot 10 is reserved */
-/* Slot 11 is reserved */
-/* Slot 12 is reserved */
-/* Slot 13 is reserved */
-/* Slot 14 is reserved */
-/* Slot 15 is reserved */
-/* Slot 16 is reserved */
-/* Slot 17 is reserved */
-/* Slot 18 is reserved */
-/* Slot 19 is reserved */
-/* Slot 20 is reserved */
-/* Slot 21 is reserved */
-/* Slot 22 is reserved */
-/* Slot 23 is reserved */
-/* Slot 24 is reserved */
-/* Slot 25 is reserved */
-/* Slot 26 is reserved */
-/* Slot 27 is reserved */
-/* Slot 28 is reserved */
-/* Slot 29 is reserved */
-/* Slot 30 is reserved */
-/* Slot 31 is reserved */
-/* Slot 32 is reserved */
-/* Slot 33 is reserved */
-/* Slot 34 is reserved */
-/* Slot 35 is reserved */
-/* Slot 36 is reserved */
-/* Slot 37 is reserved */
-/* Slot 38 is reserved */
-/* Slot 39 is reserved */
-/* Slot 40 is reserved */
-/* Slot 41 is reserved */
-/* Slot 42 is reserved */
-/* Slot 43 is reserved */
-/* Slot 44 is reserved */
-/* Slot 45 is reserved */
-/* Slot 46 is reserved */
-/* Slot 47 is reserved */
-/* Slot 48 is reserved */
-/* Slot 49 is reserved */
-/* Slot 50 is reserved */
-/* Slot 51 is reserved */
-/* Slot 52 is reserved */
-/* Slot 53 is reserved */
-/* Slot 54 is reserved */
-/* Slot 55 is reserved */
-/* Slot 56 is reserved */
-/* Slot 57 is reserved */
-/* Slot 58 is reserved */
-/* Slot 59 is reserved */
-/* Slot 60 is reserved */
-/* Slot 61 is reserved */
-/* Slot 62 is reserved */
-/* Slot 63 is reserved */
-/* Slot 64 is reserved */
-/* Slot 65 is reserved */
-/* Slot 66 is reserved */
-/* Slot 67 is reserved */
-/* Slot 68 is reserved */
-/* Slot 69 is reserved */
-/* Slot 70 is reserved */
-/* Slot 71 is reserved */
-/* Slot 72 is reserved */
-/* Slot 73 is reserved */
-/* Slot 74 is reserved */
-/* Slot 75 is reserved */
-/* Slot 76 is reserved */
-/* Slot 77 is reserved */
-/* 78 */
+/* 0 */
 EXTERN XModifierKeymap*	 XGetModifierMapping _ANSI_ARGS_((Display* d));
-/* 79 */
+/* 1 */
 EXTERN XImage *		XCreateImage _ANSI_ARGS_((Display* d, Visual* v, 
 				unsigned int ui1, int i1, int i2, char* cp, 
 				unsigned int ui2, unsigned int ui3, int i3, 
 				int i4));
-/* 80 */
+/* 2 */
 EXTERN XImage *		XGetImage _ANSI_ARGS_((Display* d, Drawable dr, 
 				int i1, int i2, unsigned int ui1, 
 				unsigned int ui2, unsigned long ul, int i3));
-/* 81 */
+/* 3 */
 EXTERN char *		XGetAtomName _ANSI_ARGS_((Display* d, Atom a));
-/* 82 */
+/* 4 */
 EXTERN char *		XKeysymToString _ANSI_ARGS_((KeySym k));
-/* 83 */
+/* 5 */
 EXTERN Colormap		XCreateColormap _ANSI_ARGS_((Display* d, Window w, 
 				Visual* v, int i));
-/* Slot 84 is reserved */
-/* Slot 85 is reserved */
-/* 86 */
+/* 6 */
 EXTERN GContext		XGContextFromGC _ANSI_ARGS_((GC g));
-/* Slot 87 is reserved */
-/* 88 */
+/* 7 */
 EXTERN KeySym		XKeycodeToKeysym _ANSI_ARGS_((Display* d, KeyCode k, 
 				int i));
-/* 89 */
+/* 8 */
 EXTERN KeySym		XStringToKeysym _ANSI_ARGS_((_Xconst char* c));
-/* 90 */
+/* 9 */
 EXTERN Window		XRootWindow _ANSI_ARGS_((Display* d, int i));
-/* 91 */
+/* 10 */
 EXTERN XErrorHandler	XSetErrorHandler _ANSI_ARGS_((XErrorHandler x));
-/* Slot 92 is reserved */
-/* Slot 93 is reserved */
-/* Slot 94 is reserved */
-/* 95 */
+/* 11 */
 EXTERN Status		XAllocColor _ANSI_ARGS_((Display* d, Colormap c, 
 				XColor* xp));
-/* 96 */
+/* 12 */
 EXTERN void		XBell _ANSI_ARGS_((Display* d, int i));
-/* 97 */
+/* 13 */
 EXTERN void		XChangeProperty _ANSI_ARGS_((Display* d, Window w, 
 				Atom a, Atom a, int i1, int i2, 
 				_Xconst unsigned char* c, int i3));
-/* 98 */
+/* 14 */
 EXTERN void		XChangeWindowAttributes _ANSI_ARGS_((Display* d, 
 				Window w, unsigned long ul, 
 				XSetWindowAttributes* x));
-/* Slot 99 is reserved */
-/* 100 */
+/* 15 */
 EXTERN void		XConfigureWindow _ANSI_ARGS_((Display* d, Window w, 
 				unsigned int i, XWindowChanges* x));
-/* 101 */
+/* 16 */
 EXTERN void		XCopyArea _ANSI_ARGS_((Display* d, Drawable dr1, 
 				Drawable dr2, GC g, int i1, int i2, 
 				unsigned int ui1, unsigned int ui2, int i3, 
 				int i4));
-/* 102 */
+/* 17 */
 EXTERN void		XCopyPlane _ANSI_ARGS_((Display* d, Drawable dr1, 
 				Drawable dr2, GC g, int i1, int i2, 
 				unsigned int ui1, unsigned int ui2, int i3, 
 				int i4, unsigned long ul));
-/* 103 */
+/* 18 */
 EXTERN void		XDefineCursor _ANSI_ARGS_((Display* d, Window w, 
 				Cursor c));
-/* Slot 104 is reserved */
-/* 105 */
+/* 19 */
 EXTERN void		XDestroyWindow _ANSI_ARGS_((Display* d, Window w));
-/* 106 */
+/* 20 */
 EXTERN void		XDrawArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, 
 				int i1, int i2, unsigned int ui1, 
 				unsigned int ui2, int i3, int i4));
-/* 107 */
+/* 21 */
 EXTERN void		XDrawLines _ANSI_ARGS_((Display* d, Drawable dr, 
 				GC g, XPoint* x, int i1, int i2));
-/* 108 */
+/* 22 */
 EXTERN void		XDrawRectangle _ANSI_ARGS_((Display* d, Drawable dr, 
 				GC g, int i1, int i2, unsigned int ui1, 
 				unsigned int ui2));
-/* 109 */
+/* 23 */
 EXTERN void		XFillArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, 
 				int i1, int i2, unsigned int ui1, 
 				unsigned int ui2, int i3, int i4));
-/* 110 */
+/* 24 */
 EXTERN void		XFillPolygon _ANSI_ARGS_((Display* d, Drawable dr, 
 				GC g, XPoint* x, int i1, int i2, int i3));
-/* 111 */
+/* 25 */
 EXTERN void		XFillRectangles _ANSI_ARGS_((Display* d, Drawable dr, 
 				GC g, XRectangle* x, int i));
-/* Slot 112 is reserved */
-/* 113 */
+/* 26 */
 EXTERN void		XFreeColormap _ANSI_ARGS_((Display* d, Colormap c));
-/* 114 */
+/* 27 */
 EXTERN void		XFreeColors _ANSI_ARGS_((Display* d, Colormap c, 
 				unsigned long* ulp, int i, unsigned long ul));
-/* Slot 115 is reserved */
-/* 116 */
+/* 28 */
 EXTERN void		XFreeModifiermap _ANSI_ARGS_((XModifierKeymap* x));
-/* 117 */
+/* 29 */
 EXTERN Status		XGetGeometry _ANSI_ARGS_((Display* d, Drawable dr, 
 				Window* w, int* i1, int* i2, 
 				unsigned int* ui1, unsigned int* ui2, 
 				unsigned int* ui3, unsigned int* ui4));
-/* Slot 118 is reserved */
-/* 119 */
+/* 30 */
 EXTERN int		XGetWindowProperty _ANSI_ARGS_((Display* d, Window w, 
 				Atom a1, long l1, long l2, Bool b, Atom a2, 
 				Atom* ap, int* ip, unsigned long* ulp1, 
 				unsigned long* ulp2, unsigned char** cpp));
-/* Slot 120 is reserved */
-/* 121 */
+/* 31 */
 EXTERN int		XGrabKeyboard _ANSI_ARGS_((Display* d, Window w, 
 				Bool b, int i1, int i2, Time t));
-/* 122 */
+/* 32 */
 EXTERN int		XGrabPointer _ANSI_ARGS_((Display* d, Window w1, 
 				Bool b, unsigned int ui, int i1, int i2, 
 				Window w2, Cursor c, Time t));
-/* 123 */
+/* 33 */
 EXTERN KeyCode		XKeysymToKeycode _ANSI_ARGS_((Display* d, KeySym k));
-/* Slot 124 is reserved */
-/* 125 */
+/* 34 */
 EXTERN void		XMapWindow _ANSI_ARGS_((Display* d, Window w));
-/* 126 */
+/* 35 */
 EXTERN void		XMoveResizeWindow _ANSI_ARGS_((Display* d, Window w, 
 				int i1, int i2, unsigned int ui1, 
 				unsigned int ui2));
-/* 127 */
+/* 36 */
 EXTERN void		XMoveWindow _ANSI_ARGS_((Display* d, Window w, 
 				int i1, int i2));
-/* Slot 128 is reserved */
-/* Slot 129 is reserved */
-/* Slot 130 is reserved */
-/* 131 */
+/* 37 */
 EXTERN Bool		XQueryPointer _ANSI_ARGS_((Display* d, Window w1, 
 				Window* w2, Window* w3, int* i1, int* i2, 
 				int* i3, int* i4, unsigned int* ui));
-/* Slot 132 is reserved */
-/* 133 */
+/* 38 */
 EXTERN void		XRaiseWindow _ANSI_ARGS_((Display* d, Window w));
-/* 134 */
+/* 39 */
 EXTERN void		XRefreshKeyboardMapping _ANSI_ARGS_((
 				XMappingEvent* x));
-/* 135 */
+/* 40 */
 EXTERN void		XResizeWindow _ANSI_ARGS_((Display* d, Window w, 
 				unsigned int ui1, unsigned int ui2));
-/* 136 */
+/* 41 */
 EXTERN void		XSelectInput _ANSI_ARGS_((Display* d, Window w, 
 				long l));
-/* 137 */
+/* 42 */
 EXTERN Status		XSendEvent _ANSI_ARGS_((Display* d, Window w, Bool b, 
 				long l, XEvent* x));
-/* Slot 138 is reserved */
-/* 139 */
+/* 43 */
 EXTERN void		XSetIconName _ANSI_ARGS_((Display* d, Window w, 
 				_Xconst char* c));
-/* 140 */
+/* 44 */
 EXTERN void		XSetInputFocus _ANSI_ARGS_((Display* d, Window w, 
 				int i, Time t));
-/* 141 */
+/* 45 */
 EXTERN void		XSetSelectionOwner _ANSI_ARGS_((Display* d, Atom a, 
 				Window w, Time t));
-/* 142 */
+/* 46 */
 EXTERN void		XSetWindowBackground _ANSI_ARGS_((Display* d, 
 				Window w, unsigned long ul));
-/* 143 */
+/* 47 */
 EXTERN void		XSetWindowBackgroundPixmap _ANSI_ARGS_((Display* d, 
 				Window w, Pixmap p));
-/* 144 */
+/* 48 */
 EXTERN void		XSetWindowBorder _ANSI_ARGS_((Display* d, Window w, 
 				unsigned long ul));
-/* 145 */
+/* 49 */
 EXTERN void		XSetWindowBorderPixmap _ANSI_ARGS_((Display* d, 
 				Window w, Pixmap p));
-/* 146 */
+/* 50 */
 EXTERN void		XSetWindowBorderWidth _ANSI_ARGS_((Display* d, 
 				Window w, unsigned int ui));
-/* 147 */
+/* 51 */
 EXTERN void		XSetWindowColormap _ANSI_ARGS_((Display* d, Window w, 
 				Colormap c));
-/* Slot 148 is reserved */
-/* 149 */
+/* 52 */
 EXTERN void		XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t));
-/* 150 */
+/* 53 */
 EXTERN void		XUngrabPointer _ANSI_ARGS_((Display* d, Time t));
-/* 151 */
+/* 54 */
 EXTERN void		XUnmapWindow _ANSI_ARGS_((Display* d, Window w));
-/* Slot 152 is reserved */
-/* Slot 153 is reserved */
-/* Slot 154 is reserved */
-/* Slot 155 is reserved */
-/* 156 */
+/* 55 */
 EXTERN void		TkPutImage _ANSI_ARGS_((unsigned long * colors, 
 				int ncolors, Display* display, Drawable d, 
 				GC gc, XImage* image, int src_x, int src_y, 
@@ -636,163 +535,62 @@ typedef struct TkIntXlibStubs {
     void (*tkPutImage) _ANSI_ARGS_((unsigned long * colors, int ncolors, Display* display, Drawable d, GC gc, XImage* image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 78 */
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
-    void *reserved0;
-    void *reserved1;
-    void *reserved2;
-    void *reserved3;
-    void *reserved4;
-    void *reserved5;
-    void *reserved6;
-    void *reserved7;
-    void *reserved8;
-    void *reserved9;
-    void *reserved10;
-    void *reserved11;
-    void *reserved12;
-    void *reserved13;
-    void *reserved14;
-    void *reserved15;
-    void *reserved16;
-    void *reserved17;
-    void *reserved18;
-    void *reserved19;
-    void *reserved20;
-    void *reserved21;
-    void *reserved22;
-    void *reserved23;
-    void *reserved24;
-    void *reserved25;
-    void *reserved26;
-    void *reserved27;
-    void *reserved28;
-    void *reserved29;
-    void *reserved30;
-    void *reserved31;
-    void *reserved32;
-    void *reserved33;
-    void *reserved34;
-    void *reserved35;
-    void *reserved36;
-    void *reserved37;
-    void *reserved38;
-    void *reserved39;
-    void *reserved40;
-    void *reserved41;
-    void *reserved42;
-    void *reserved43;
-    void *reserved44;
-    void *reserved45;
-    void *reserved46;
-    void *reserved47;
-    void *reserved48;
-    void *reserved49;
-    void *reserved50;
-    void *reserved51;
-    void *reserved52;
-    void *reserved53;
-    void *reserved54;
-    void *reserved55;
-    void *reserved56;
-    void *reserved57;
-    void *reserved58;
-    void *reserved59;
-    void *reserved60;
-    void *reserved61;
-    void *reserved62;
-    void *reserved63;
-    void *reserved64;
-    void *reserved65;
-    void *reserved66;
-    void *reserved67;
-    void *reserved68;
-    void *reserved69;
-    void *reserved70;
-    void *reserved71;
-    void *reserved72;
-    void *reserved73;
-    void *reserved74;
-    void *reserved75;
-    void *reserved76;
-    void *reserved77;
-    XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display* d)); /* 78 */
-    XImage * (*xCreateImage) _ANSI_ARGS_((Display* d, Visual* v, unsigned int ui1, int i1, int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 79 */
-    XImage * (*xGetImage) _ANSI_ARGS_((Display* d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 80 */
-    char * (*xGetAtomName) _ANSI_ARGS_((Display* d, Atom a)); /* 81 */
-    char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 82 */
-    Colormap (*xCreateColormap) _ANSI_ARGS_((Display* d, Window w, Visual* v, int i)); /* 83 */
-    void *reserved84;
-    void *reserved85;
-    GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 86 */
-    void *reserved87;
-    KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display* d, KeyCode k, int i)); /* 88 */
-    KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char* c)); /* 89 */
-    Window (*xRootWindow) _ANSI_ARGS_((Display* d, int i)); /* 90 */
-    XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 91 */
-    void *reserved92;
-    void *reserved93;
-    void *reserved94;
-    Status (*xAllocColor) _ANSI_ARGS_((Display* d, Colormap c, XColor* xp)); /* 95 */
-    void (*xBell) _ANSI_ARGS_((Display* d, int i)); /* 96 */
-    void (*xChangeProperty) _ANSI_ARGS_((Display* d, Window w, Atom a, Atom a, int i1, int i2, _Xconst unsigned char* c, int i3)); /* 97 */
-    void (*xChangeWindowAttributes) _ANSI_ARGS_((Display* d, Window w, unsigned long ul, XSetWindowAttributes* x)); /* 98 */
-    void *reserved99;
-    void (*xConfigureWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); /* 100 */
-    void (*xCopyArea) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 101 */
-    void (*xCopyPlane) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 102 */
-    void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 103 */
-    void *reserved104;
-    void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 105 */
-    void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 106 */
-    void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 107 */
-    void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 108 */
-    void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 109 */
-    void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 110 */
-    void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 111 */
-    void *reserved112;
-    void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 113 */
-    void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 114 */
-    void *reserved115;
-    void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 116 */
-    Status (*xGetGeometry) _ANSI_ARGS_((Display* d, Drawable dr, Window* w, int* i1, int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, unsigned int* ui4)); /* 117 */
-    void *reserved118;
-    int (*xGetWindowProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, unsigned long* ulp2, unsigned char** cpp)); /* 119 */
-    void *reserved120;
-    int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 121 */
-    int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 122 */
-    KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 123 */
-    void *reserved124;
-    void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 125 */
-    void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 126 */
-    void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 127 */
-    void *reserved128;
-    void *reserved129;
-    void *reserved130;
-    Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 131 */
-    void *reserved132;
-    void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 133 */
-    void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 134 */
-    void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 135 */
-    void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 136 */
-    Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 137 */
-    void *reserved138;
-    void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 139 */
-    void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 140 */
-    void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 141 */
-    void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 142 */
-    void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 143 */
-    void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 144 */
-    void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 145 */
-    void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 146 */
-    void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 147 */
-    void *reserved148;
-    void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 149 */
-    void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 150 */
-    void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 151 */
-    void *reserved152;
-    void *reserved153;
-    void *reserved154;
-    void *reserved155;
-    void (*tkPutImage) _ANSI_ARGS_((unsigned long * colors, int ncolors, Display* display, Drawable d, GC gc, XImage* image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 156 */
+    XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display* d)); /* 0 */
+    XImage * (*xCreateImage) _ANSI_ARGS_((Display* d, Visual* v, unsigned int ui1, int i1, int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 1 */
+    XImage * (*xGetImage) _ANSI_ARGS_((Display* d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 2 */
+    char * (*xGetAtomName) _ANSI_ARGS_((Display* d, Atom a)); /* 3 */
+    char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 4 */
+    Colormap (*xCreateColormap) _ANSI_ARGS_((Display* d, Window w, Visual* v, int i)); /* 5 */
+    GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 6 */
+    KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display* d, KeyCode k, int i)); /* 7 */
+    KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char* c)); /* 8 */
+    Window (*xRootWindow) _ANSI_ARGS_((Display* d, int i)); /* 9 */
+    XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 10 */
+    Status (*xAllocColor) _ANSI_ARGS_((Display* d, Colormap c, XColor* xp)); /* 11 */
+    void (*xBell) _ANSI_ARGS_((Display* d, int i)); /* 12 */
+    void (*xChangeProperty) _ANSI_ARGS_((Display* d, Window w, Atom a, Atom a, int i1, int i2, _Xconst unsigned char* c, int i3)); /* 13 */
+    void (*xChangeWindowAttributes) _ANSI_ARGS_((Display* d, Window w, unsigned long ul, XSetWindowAttributes* x)); /* 14 */
+    void (*xConfigureWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); /* 15 */
+    void (*xCopyArea) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 16 */
+    void (*xCopyPlane) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 17 */
+    void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 18 */
+    void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 19 */
+    void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 20 */
+    void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 21 */
+    void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 22 */
+    void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 23 */
+    void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 24 */
+    void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 25 */
+    void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 26 */
+    void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 27 */
+    void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 28 */
+    Status (*xGetGeometry) _ANSI_ARGS_((Display* d, Drawable dr, Window* w, int* i1, int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, unsigned int* ui4)); /* 29 */
+    int (*xGetWindowProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, unsigned long* ulp2, unsigned char** cpp)); /* 30 */
+    int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 31 */
+    int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 32 */
+    KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 33 */
+    void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 34 */
+    void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 35 */
+    void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 36 */
+    Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 37 */
+    void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 38 */
+    void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 39 */
+    void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 40 */
+    void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 41 */
+    Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 42 */
+    void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 43 */
+    void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 44 */
+    void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 45 */
+    void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 46 */
+    void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 47 */
+    void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 48 */
+    void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 49 */
+    void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 50 */
+    void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 51 */
+    void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 52 */
+    void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 53 */
+    void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 54 */
+    void (*tkPutImage) _ANSI_ARGS_((unsigned long * colors, int ncolors, Display* display, Drawable d, GC gc, XImage* image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 55 */
 #endif /* MAC_TCL */
 } TkIntXlibStubs;
 
@@ -1123,330 +921,229 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 #endif
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
-/* Slot 0 is reserved */
-/* Slot 1 is reserved */
-/* Slot 2 is reserved */
-/* Slot 3 is reserved */
-/* Slot 4 is reserved */
-/* Slot 5 is reserved */
-/* Slot 6 is reserved */
-/* Slot 7 is reserved */
-/* Slot 8 is reserved */
-/* Slot 9 is reserved */
-/* Slot 10 is reserved */
-/* Slot 11 is reserved */
-/* Slot 12 is reserved */
-/* Slot 13 is reserved */
-/* Slot 14 is reserved */
-/* Slot 15 is reserved */
-/* Slot 16 is reserved */
-/* Slot 17 is reserved */
-/* Slot 18 is reserved */
-/* Slot 19 is reserved */
-/* Slot 20 is reserved */
-/* Slot 21 is reserved */
-/* Slot 22 is reserved */
-/* Slot 23 is reserved */
-/* Slot 24 is reserved */
-/* Slot 25 is reserved */
-/* Slot 26 is reserved */
-/* Slot 27 is reserved */
-/* Slot 28 is reserved */
-/* Slot 29 is reserved */
-/* Slot 30 is reserved */
-/* Slot 31 is reserved */
-/* Slot 32 is reserved */
-/* Slot 33 is reserved */
-/* Slot 34 is reserved */
-/* Slot 35 is reserved */
-/* Slot 36 is reserved */
-/* Slot 37 is reserved */
-/* Slot 38 is reserved */
-/* Slot 39 is reserved */
-/* Slot 40 is reserved */
-/* Slot 41 is reserved */
-/* Slot 42 is reserved */
-/* Slot 43 is reserved */
-/* Slot 44 is reserved */
-/* Slot 45 is reserved */
-/* Slot 46 is reserved */
-/* Slot 47 is reserved */
-/* Slot 48 is reserved */
-/* Slot 49 is reserved */
-/* Slot 50 is reserved */
-/* Slot 51 is reserved */
-/* Slot 52 is reserved */
-/* Slot 53 is reserved */
-/* Slot 54 is reserved */
-/* Slot 55 is reserved */
-/* Slot 56 is reserved */
-/* Slot 57 is reserved */
-/* Slot 58 is reserved */
-/* Slot 59 is reserved */
-/* Slot 60 is reserved */
-/* Slot 61 is reserved */
-/* Slot 62 is reserved */
-/* Slot 63 is reserved */
-/* Slot 64 is reserved */
-/* Slot 65 is reserved */
-/* Slot 66 is reserved */
-/* Slot 67 is reserved */
-/* Slot 68 is reserved */
-/* Slot 69 is reserved */
-/* Slot 70 is reserved */
-/* Slot 71 is reserved */
-/* Slot 72 is reserved */
-/* Slot 73 is reserved */
-/* Slot 74 is reserved */
-/* Slot 75 is reserved */
-/* Slot 76 is reserved */
-/* Slot 77 is reserved */
 #ifndef XGetModifierMapping
 #define XGetModifierMapping(d) \
-	(tkIntXlibStubsPtr->xGetModifierMapping)(d) /* 78 */
+	(tkIntXlibStubsPtr->xGetModifierMapping)(d) /* 0 */
 #endif
 #ifndef XCreateImage
 #define XCreateImage(d, v, ui1, i1, i2, cp, ui2, ui3, i3, i4) \
-	(tkIntXlibStubsPtr->xCreateImage)(d, v, ui1, i1, i2, cp, ui2, ui3, i3, i4) /* 79 */
+	(tkIntXlibStubsPtr->xCreateImage)(d, v, ui1, i1, i2, cp, ui2, ui3, i3, i4) /* 1 */
 #endif
 #ifndef XGetImage
 #define XGetImage(d, dr, i1, i2, ui1, ui2, ul, i3) \
-	(tkIntXlibStubsPtr->xGetImage)(d, dr, i1, i2, ui1, ui2, ul, i3) /* 80 */
+	(tkIntXlibStubsPtr->xGetImage)(d, dr, i1, i2, ui1, ui2, ul, i3) /* 2 */
 #endif
 #ifndef XGetAtomName
 #define XGetAtomName(d, a) \
-	(tkIntXlibStubsPtr->xGetAtomName)(d, a) /* 81 */
+	(tkIntXlibStubsPtr->xGetAtomName)(d, a) /* 3 */
 #endif
 #ifndef XKeysymToString
 #define XKeysymToString(k) \
-	(tkIntXlibStubsPtr->xKeysymToString)(k) /* 82 */
+	(tkIntXlibStubsPtr->xKeysymToString)(k) /* 4 */
 #endif
 #ifndef XCreateColormap
 #define XCreateColormap(d, w, v, i) \
-	(tkIntXlibStubsPtr->xCreateColormap)(d, w, v, i) /* 83 */
+	(tkIntXlibStubsPtr->xCreateColormap)(d, w, v, i) /* 5 */
 #endif
-/* Slot 84 is reserved */
-/* Slot 85 is reserved */
 #ifndef XGContextFromGC
 #define XGContextFromGC(g) \
-	(tkIntXlibStubsPtr->xGContextFromGC)(g) /* 86 */
+	(tkIntXlibStubsPtr->xGContextFromGC)(g) /* 6 */
 #endif
-/* Slot 87 is reserved */
 #ifndef XKeycodeToKeysym
 #define XKeycodeToKeysym(d, k, i) \
-	(tkIntXlibStubsPtr->xKeycodeToKeysym)(d, k, i) /* 88 */
+	(tkIntXlibStubsPtr->xKeycodeToKeysym)(d, k, i) /* 7 */
 #endif
 #ifndef XStringToKeysym
 #define XStringToKeysym(c) \
-	(tkIntXlibStubsPtr->xStringToKeysym)(c) /* 89 */
+	(tkIntXlibStubsPtr->xStringToKeysym)(c) /* 8 */
 #endif
 #ifndef XRootWindow
 #define XRootWindow(d, i) \
-	(tkIntXlibStubsPtr->xRootWindow)(d, i) /* 90 */
+	(tkIntXlibStubsPtr->xRootWindow)(d, i) /* 9 */
 #endif
 #ifndef XSetErrorHandler
 #define XSetErrorHandler(x) \
-	(tkIntXlibStubsPtr->xSetErrorHandler)(x) /* 91 */
+	(tkIntXlibStubsPtr->xSetErrorHandler)(x) /* 10 */
 #endif
-/* Slot 92 is reserved */
-/* Slot 93 is reserved */
-/* Slot 94 is reserved */
 #ifndef XAllocColor
 #define XAllocColor(d, c, xp) \
-	(tkIntXlibStubsPtr->xAllocColor)(d, c, xp) /* 95 */
+	(tkIntXlibStubsPtr->xAllocColor)(d, c, xp) /* 11 */
 #endif
 #ifndef XBell
 #define XBell(d, i) \
-	(tkIntXlibStubsPtr->xBell)(d, i) /* 96 */
+	(tkIntXlibStubsPtr->xBell)(d, i) /* 12 */
 #endif
 #ifndef XChangeProperty
 #define XChangeProperty(d, w, a, a, i1, i2, c, i3) \
-	(tkIntXlibStubsPtr->xChangeProperty)(d, w, a, a, i1, i2, c, i3) /* 97 */
+	(tkIntXlibStubsPtr->xChangeProperty)(d, w, a, a, i1, i2, c, i3) /* 13 */
 #endif
 #ifndef XChangeWindowAttributes
 #define XChangeWindowAttributes(d, w, ul, x) \
-	(tkIntXlibStubsPtr->xChangeWindowAttributes)(d, w, ul, x) /* 98 */
+	(tkIntXlibStubsPtr->xChangeWindowAttributes)(d, w, ul, x) /* 14 */
 #endif
-/* Slot 99 is reserved */
 #ifndef XConfigureWindow
 #define XConfigureWindow(d, w, i, x) \
-	(tkIntXlibStubsPtr->xConfigureWindow)(d, w, i, x) /* 100 */
+	(tkIntXlibStubsPtr->xConfigureWindow)(d, w, i, x) /* 15 */
 #endif
 #ifndef XCopyArea
 #define XCopyArea(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4) \
-	(tkIntXlibStubsPtr->xCopyArea)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4) /* 101 */
+	(tkIntXlibStubsPtr->xCopyArea)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4) /* 16 */
 #endif
 #ifndef XCopyPlane
 #define XCopyPlane(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul) \
-	(tkIntXlibStubsPtr->xCopyPlane)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul) /* 102 */
+	(tkIntXlibStubsPtr->xCopyPlane)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul) /* 17 */
 #endif
 #ifndef XDefineCursor
 #define XDefineCursor(d, w, c) \
-	(tkIntXlibStubsPtr->xDefineCursor)(d, w, c) /* 103 */
+	(tkIntXlibStubsPtr->xDefineCursor)(d, w, c) /* 18 */
 #endif
-/* Slot 104 is reserved */
 #ifndef XDestroyWindow
 #define XDestroyWindow(d, w) \
-	(tkIntXlibStubsPtr->xDestroyWindow)(d, w) /* 105 */
+	(tkIntXlibStubsPtr->xDestroyWindow)(d, w) /* 19 */
 #endif
 #ifndef XDrawArc
 #define XDrawArc(d, dr, g, i1, i2, ui1, ui2, i3, i4) \
-	(tkIntXlibStubsPtr->xDrawArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 106 */
+	(tkIntXlibStubsPtr->xDrawArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 20 */
 #endif
 #ifndef XDrawLines
 #define XDrawLines(d, dr, g, x, i1, i2) \
-	(tkIntXlibStubsPtr->xDrawLines)(d, dr, g, x, i1, i2) /* 107 */
+	(tkIntXlibStubsPtr->xDrawLines)(d, dr, g, x, i1, i2) /* 21 */
 #endif
 #ifndef XDrawRectangle
 #define XDrawRectangle(d, dr, g, i1, i2, ui1, ui2) \
-	(tkIntXlibStubsPtr->xDrawRectangle)(d, dr, g, i1, i2, ui1, ui2) /* 108 */
+	(tkIntXlibStubsPtr->xDrawRectangle)(d, dr, g, i1, i2, ui1, ui2) /* 22 */
 #endif
 #ifndef XFillArc
 #define XFillArc(d, dr, g, i1, i2, ui1, ui2, i3, i4) \
-	(tkIntXlibStubsPtr->xFillArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 109 */
+	(tkIntXlibStubsPtr->xFillArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 23 */
 #endif
 #ifndef XFillPolygon
 #define XFillPolygon(d, dr, g, x, i1, i2, i3) \
-	(tkIntXlibStubsPtr->xFillPolygon)(d, dr, g, x, i1, i2, i3) /* 110 */
+	(tkIntXlibStubsPtr->xFillPolygon)(d, dr, g, x, i1, i2, i3) /* 24 */
 #endif
 #ifndef XFillRectangles
 #define XFillRectangles(d, dr, g, x, i) \
-	(tkIntXlibStubsPtr->xFillRectangles)(d, dr, g, x, i) /* 111 */
+	(tkIntXlibStubsPtr->xFillRectangles)(d, dr, g, x, i) /* 25 */
 #endif
-/* Slot 112 is reserved */
 #ifndef XFreeColormap
 #define XFreeColormap(d, c) \
-	(tkIntXlibStubsPtr->xFreeColormap)(d, c) /* 113 */
+	(tkIntXlibStubsPtr->xFreeColormap)(d, c) /* 26 */
 #endif
 #ifndef XFreeColors
 #define XFreeColors(d, c, ulp, i, ul) \
-	(tkIntXlibStubsPtr->xFreeColors)(d, c, ulp, i, ul) /* 114 */
+	(tkIntXlibStubsPtr->xFreeColors)(d, c, ulp, i, ul) /* 27 */
 #endif
-/* Slot 115 is reserved */
 #ifndef XFreeModifiermap
 #define XFreeModifiermap(x) \
-	(tkIntXlibStubsPtr->xFreeModifiermap)(x) /* 116 */
+	(tkIntXlibStubsPtr->xFreeModifiermap)(x) /* 28 */
 #endif
 #ifndef XGetGeometry
 #define XGetGeometry(d, dr, w, i1, i2, ui1, ui2, ui3, ui4) \
-	(tkIntXlibStubsPtr->xGetGeometry)(d, dr, w, i1, i2, ui1, ui2, ui3, ui4) /* 117 */
+	(tkIntXlibStubsPtr->xGetGeometry)(d, dr, w, i1, i2, ui1, ui2, ui3, ui4) /* 29 */
 #endif
-/* Slot 118 is reserved */
 #ifndef XGetWindowProperty
 #define XGetWindowProperty(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp) \
-	(tkIntXlibStubsPtr->xGetWindowProperty)(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp) /* 119 */
+	(tkIntXlibStubsPtr->xGetWindowProperty)(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp) /* 30 */
 #endif
-/* Slot 120 is reserved */
 #ifndef XGrabKeyboard
 #define XGrabKeyboard(d, w, b, i1, i2, t) \
-	(tkIntXlibStubsPtr->xGrabKeyboard)(d, w, b, i1, i2, t) /* 121 */
+	(tkIntXlibStubsPtr->xGrabKeyboard)(d, w, b, i1, i2, t) /* 31 */
 #endif
 #ifndef XGrabPointer
 #define XGrabPointer(d, w1, b, ui, i1, i2, w2, c, t) \
-	(tkIntXlibStubsPtr->xGrabPointer)(d, w1, b, ui, i1, i2, w2, c, t) /* 122 */
+	(tkIntXlibStubsPtr->xGrabPointer)(d, w1, b, ui, i1, i2, w2, c, t) /* 32 */
 #endif
 #ifndef XKeysymToKeycode
 #define XKeysymToKeycode(d, k) \
-	(tkIntXlibStubsPtr->xKeysymToKeycode)(d, k) /* 123 */
+	(tkIntXlibStubsPtr->xKeysymToKeycode)(d, k) /* 33 */
 #endif
-/* Slot 124 is reserved */
 #ifndef XMapWindow
 #define XMapWindow(d, w) \
-	(tkIntXlibStubsPtr->xMapWindow)(d, w) /* 125 */
+	(tkIntXlibStubsPtr->xMapWindow)(d, w) /* 34 */
 #endif
 #ifndef XMoveResizeWindow
 #define XMoveResizeWindow(d, w, i1, i2, ui1, ui2) \
-	(tkIntXlibStubsPtr->xMoveResizeWindow)(d, w, i1, i2, ui1, ui2) /* 126 */
+	(tkIntXlibStubsPtr->xMoveResizeWindow)(d, w, i1, i2, ui1, ui2) /* 35 */
 #endif
 #ifndef XMoveWindow
 #define XMoveWindow(d, w, i1, i2) \
-	(tkIntXlibStubsPtr->xMoveWindow)(d, w, i1, i2) /* 127 */
+	(tkIntXlibStubsPtr->xMoveWindow)(d, w, i1, i2) /* 36 */
 #endif
-/* Slot 128 is reserved */
-/* Slot 129 is reserved */
-/* Slot 130 is reserved */
 #ifndef XQueryPointer
 #define XQueryPointer(d, w1, w2, w3, i1, i2, i3, i4, ui) \
-	(tkIntXlibStubsPtr->xQueryPointer)(d, w1, w2, w3, i1, i2, i3, i4, ui) /* 131 */
+	(tkIntXlibStubsPtr->xQueryPointer)(d, w1, w2, w3, i1, i2, i3, i4, ui) /* 37 */
 #endif
-/* Slot 132 is reserved */
 #ifndef XRaiseWindow
 #define XRaiseWindow(d, w) \
-	(tkIntXlibStubsPtr->xRaiseWindow)(d, w) /* 133 */
+	(tkIntXlibStubsPtr->xRaiseWindow)(d, w) /* 38 */
 #endif
 #ifndef XRefreshKeyboardMapping
 #define XRefreshKeyboardMapping(x) \
-	(tkIntXlibStubsPtr->xRefreshKeyboardMapping)(x) /* 134 */
+	(tkIntXlibStubsPtr->xRefreshKeyboardMapping)(x) /* 39 */
 #endif
 #ifndef XResizeWindow
 #define XResizeWindow(d, w, ui1, ui2) \
-	(tkIntXlibStubsPtr->xResizeWindow)(d, w, ui1, ui2) /* 135 */
+	(tkIntXlibStubsPtr->xResizeWindow)(d, w, ui1, ui2) /* 40 */
 #endif
 #ifndef XSelectInput
 #define XSelectInput(d, w, l) \
-	(tkIntXlibStubsPtr->xSelectInput)(d, w, l) /* 136 */
+	(tkIntXlibStubsPtr->xSelectInput)(d, w, l) /* 41 */
 #endif
 #ifndef XSendEvent
 #define XSendEvent(d, w, b, l, x) \
-	(tkIntXlibStubsPtr->xSendEvent)(d, w, b, l, x) /* 137 */
+	(tkIntXlibStubsPtr->xSendEvent)(d, w, b, l, x) /* 42 */
 #endif
-/* Slot 138 is reserved */
 #ifndef XSetIconName
 #define XSetIconName(d, w, c) \
-	(tkIntXlibStubsPtr->xSetIconName)(d, w, c) /* 139 */
+	(tkIntXlibStubsPtr->xSetIconName)(d, w, c) /* 43 */
 #endif
 #ifndef XSetInputFocus
 #define XSetInputFocus(d, w, i, t) \
-	(tkIntXlibStubsPtr->xSetInputFocus)(d, w, i, t) /* 140 */
+	(tkIntXlibStubsPtr->xSetInputFocus)(d, w, i, t) /* 44 */
 #endif
 #ifndef XSetSelectionOwner
 #define XSetSelectionOwner(d, a, w, t) \
-	(tkIntXlibStubsPtr->xSetSelectionOwner)(d, a, w, t) /* 141 */
+	(tkIntXlibStubsPtr->xSetSelectionOwner)(d, a, w, t) /* 45 */
 #endif
 #ifndef XSetWindowBackground
 #define XSetWindowBackground(d, w, ul) \
-	(tkIntXlibStubsPtr->xSetWindowBackground)(d, w, ul) /* 142 */
+	(tkIntXlibStubsPtr->xSetWindowBackground)(d, w, ul) /* 46 */
 #endif
 #ifndef XSetWindowBackgroundPixmap
 #define XSetWindowBackgroundPixmap(d, w, p) \
-	(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap)(d, w, p) /* 143 */
+	(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap)(d, w, p) /* 47 */
 #endif
 #ifndef XSetWindowBorder
 #define XSetWindowBorder(d, w, ul) \
-	(tkIntXlibStubsPtr->xSetWindowBorder)(d, w, ul) /* 144 */
+	(tkIntXlibStubsPtr->xSetWindowBorder)(d, w, ul) /* 48 */
 #endif
 #ifndef XSetWindowBorderPixmap
 #define XSetWindowBorderPixmap(d, w, p) \
-	(tkIntXlibStubsPtr->xSetWindowBorderPixmap)(d, w, p) /* 145 */
+	(tkIntXlibStubsPtr->xSetWindowBorderPixmap)(d, w, p) /* 49 */
 #endif
 #ifndef XSetWindowBorderWidth
 #define XSetWindowBorderWidth(d, w, ui) \
-	(tkIntXlibStubsPtr->xSetWindowBorderWidth)(d, w, ui) /* 146 */
+	(tkIntXlibStubsPtr->xSetWindowBorderWidth)(d, w, ui) /* 50 */
 #endif
 #ifndef XSetWindowColormap
 #define XSetWindowColormap(d, w, c) \
-	(tkIntXlibStubsPtr->xSetWindowColormap)(d, w, c) /* 147 */
+	(tkIntXlibStubsPtr->xSetWindowColormap)(d, w, c) /* 51 */
 #endif
-/* Slot 148 is reserved */
 #ifndef XUngrabKeyboard
 #define XUngrabKeyboard(d, t) \
-	(tkIntXlibStubsPtr->xUngrabKeyboard)(d, t) /* 149 */
+	(tkIntXlibStubsPtr->xUngrabKeyboard)(d, t) /* 52 */
 #endif
 #ifndef XUngrabPointer
 #define XUngrabPointer(d, t) \
-	(tkIntXlibStubsPtr->xUngrabPointer)(d, t) /* 150 */
+	(tkIntXlibStubsPtr->xUngrabPointer)(d, t) /* 53 */
 #endif
 #ifndef XUnmapWindow
 #define XUnmapWindow(d, w) \
-	(tkIntXlibStubsPtr->xUnmapWindow)(d, w) /* 151 */
+	(tkIntXlibStubsPtr->xUnmapWindow)(d, w) /* 54 */
 #endif
-/* Slot 152 is reserved */
-/* Slot 153 is reserved */
-/* Slot 154 is reserved */
-/* Slot 155 is reserved */
 #ifndef TkPutImage
 #define TkPutImage(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height) \
-	(tkIntXlibStubsPtr->tkPutImage)(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height) /* 156 */
+	(tkIntXlibStubsPtr->tkPutImage)(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height) /* 55 */
 #endif
 #endif /* MAC_TCL */
 
diff --git a/generic/tkIntXlibStubs.c b/generic/tkIntXlibStubs.c
index 3ce00d6..4160a57 100644
--- a/generic/tkIntXlibStubs.c
+++ b/generic/tkIntXlibStubs.c
@@ -7,7 +7,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntXlibStubs.c,v 1.1.2.1 1999/03/06 00:08:05 redman Exp $
+ * RCS: @(#) $Id: tkIntXlibStubs.c,v 1.1.2.2 1999/03/07 00:15:45 redman Exp $
  */
 
 #include "tkInt.h"
@@ -920,85 +920,7 @@ TkPutImage(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y,
 
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
-/* Slot 0 is reserved */
-/* Slot 1 is reserved */
-/* Slot 2 is reserved */
-/* Slot 3 is reserved */
-/* Slot 4 is reserved */
-/* Slot 5 is reserved */
-/* Slot 6 is reserved */
-/* Slot 7 is reserved */
-/* Slot 8 is reserved */
-/* Slot 9 is reserved */
-/* Slot 10 is reserved */
-/* Slot 11 is reserved */
-/* Slot 12 is reserved */
-/* Slot 13 is reserved */
-/* Slot 14 is reserved */
-/* Slot 15 is reserved */
-/* Slot 16 is reserved */
-/* Slot 17 is reserved */
-/* Slot 18 is reserved */
-/* Slot 19 is reserved */
-/* Slot 20 is reserved */
-/* Slot 21 is reserved */
-/* Slot 22 is reserved */
-/* Slot 23 is reserved */
-/* Slot 24 is reserved */
-/* Slot 25 is reserved */
-/* Slot 26 is reserved */
-/* Slot 27 is reserved */
-/* Slot 28 is reserved */
-/* Slot 29 is reserved */
-/* Slot 30 is reserved */
-/* Slot 31 is reserved */
-/* Slot 32 is reserved */
-/* Slot 33 is reserved */
-/* Slot 34 is reserved */
-/* Slot 35 is reserved */
-/* Slot 36 is reserved */
-/* Slot 37 is reserved */
-/* Slot 38 is reserved */
-/* Slot 39 is reserved */
-/* Slot 40 is reserved */
-/* Slot 41 is reserved */
-/* Slot 42 is reserved */
-/* Slot 43 is reserved */
-/* Slot 44 is reserved */
-/* Slot 45 is reserved */
-/* Slot 46 is reserved */
-/* Slot 47 is reserved */
-/* Slot 48 is reserved */
-/* Slot 49 is reserved */
-/* Slot 50 is reserved */
-/* Slot 51 is reserved */
-/* Slot 52 is reserved */
-/* Slot 53 is reserved */
-/* Slot 54 is reserved */
-/* Slot 55 is reserved */
-/* Slot 56 is reserved */
-/* Slot 57 is reserved */
-/* Slot 58 is reserved */
-/* Slot 59 is reserved */
-/* Slot 60 is reserved */
-/* Slot 61 is reserved */
-/* Slot 62 is reserved */
-/* Slot 63 is reserved */
-/* Slot 64 is reserved */
-/* Slot 65 is reserved */
-/* Slot 66 is reserved */
-/* Slot 67 is reserved */
-/* Slot 68 is reserved */
-/* Slot 69 is reserved */
-/* Slot 70 is reserved */
-/* Slot 71 is reserved */
-/* Slot 72 is reserved */
-/* Slot 73 is reserved */
-/* Slot 74 is reserved */
-/* Slot 75 is reserved */
-/* Slot 76 is reserved */
-/* Slot 77 is reserved */
-/* Slot 78 */
+/* Slot 0 */
 XModifierKeymap*
 XGetModifierMapping(d)
     Display* d;
@@ -1006,7 +928,7 @@ XGetModifierMapping(d)
     return (tkIntXlibStubsPtr->xGetModifierMapping)(d);
 }
 
-/* Slot 79 */
+/* Slot 1 */
 XImage *
 XCreateImage(d, v, ui1, i1, i2, cp, ui2, ui3, i3, i4)
     Display* d;
@@ -1023,7 +945,7 @@ XCreateImage(d, v, ui1, i1, i2, cp, ui2, ui3, i3, i4)
     return (tkIntXlibStubsPtr->xCreateImage)(d, v, ui1, i1, i2, cp, ui2, ui3, i3, i4);
 }
 
-/* Slot 80 */
+/* Slot 2 */
 XImage *
 XGetImage(d, dr, i1, i2, ui1, ui2, ul, i3)
     Display* d;
@@ -1038,7 +960,7 @@ XGetImage(d, dr, i1, i2, ui1, ui2, ul, i3)
     return (tkIntXlibStubsPtr->xGetImage)(d, dr, i1, i2, ui1, ui2, ul, i3);
 }
 
-/* Slot 81 */
+/* Slot 3 */
 char *
 XGetAtomName(d, a)
     Display* d;
@@ -1047,7 +969,7 @@ XGetAtomName(d, a)
     return (tkIntXlibStubsPtr->xGetAtomName)(d, a);
 }
 
-/* Slot 82 */
+/* Slot 4 */
 char *
 XKeysymToString(k)
     KeySym k;
@@ -1055,7 +977,7 @@ XKeysymToString(k)
     return (tkIntXlibStubsPtr->xKeysymToString)(k);
 }
 
-/* Slot 83 */
+/* Slot 5 */
 Colormap
 XCreateColormap(d, w, v, i)
     Display* d;
@@ -1066,9 +988,7 @@ XCreateColormap(d, w, v, i)
     return (tkIntXlibStubsPtr->xCreateColormap)(d, w, v, i);
 }
 
-/* Slot 84 is reserved */
-/* Slot 85 is reserved */
-/* Slot 86 */
+/* Slot 6 */
 GContext
 XGContextFromGC(g)
     GC g;
@@ -1076,8 +996,7 @@ XGContextFromGC(g)
     return (tkIntXlibStubsPtr->xGContextFromGC)(g);
 }
 
-/* Slot 87 is reserved */
-/* Slot 88 */
+/* Slot 7 */
 KeySym
 XKeycodeToKeysym(d, k, i)
     Display* d;
@@ -1087,7 +1006,7 @@ XKeycodeToKeysym(d, k, i)
     return (tkIntXlibStubsPtr->xKeycodeToKeysym)(d, k, i);
 }
 
-/* Slot 89 */
+/* Slot 8 */
 KeySym
 XStringToKeysym(c)
     _Xconst char* c;
@@ -1095,7 +1014,7 @@ XStringToKeysym(c)
     return (tkIntXlibStubsPtr->xStringToKeysym)(c);
 }
 
-/* Slot 90 */
+/* Slot 9 */
 Window
 XRootWindow(d, i)
     Display* d;
@@ -1104,7 +1023,7 @@ XRootWindow(d, i)
     return (tkIntXlibStubsPtr->xRootWindow)(d, i);
 }
 
-/* Slot 91 */
+/* Slot 10 */
 XErrorHandler
 XSetErrorHandler(x)
     XErrorHandler x;
@@ -1112,10 +1031,7 @@ XSetErrorHandler(x)
     return (tkIntXlibStubsPtr->xSetErrorHandler)(x);
 }
 
-/* Slot 92 is reserved */
-/* Slot 93 is reserved */
-/* Slot 94 is reserved */
-/* Slot 95 */
+/* Slot 11 */
 Status
 XAllocColor(d, c, xp)
     Display* d;
@@ -1125,7 +1041,7 @@ XAllocColor(d, c, xp)
     return (tkIntXlibStubsPtr->xAllocColor)(d, c, xp);
 }
 
-/* Slot 96 */
+/* Slot 12 */
 void
 XBell(d, i)
     Display* d;
@@ -1134,7 +1050,7 @@ XBell(d, i)
     (tkIntXlibStubsPtr->xBell)(d, i);
 }
 
-/* Slot 97 */
+/* Slot 13 */
 void
 XChangeProperty(d, w, a, a, i1, i2, c, i3)
     Display* d;
@@ -1149,7 +1065,7 @@ XChangeProperty(d, w, a, a, i1, i2, c, i3)
     (tkIntXlibStubsPtr->xChangeProperty)(d, w, a, a, i1, i2, c, i3);
 }
 
-/* Slot 98 */
+/* Slot 14 */
 void
 XChangeWindowAttributes(d, w, ul, x)
     Display* d;
@@ -1160,8 +1076,7 @@ XChangeWindowAttributes(d, w, ul, x)
     (tkIntXlibStubsPtr->xChangeWindowAttributes)(d, w, ul, x);
 }
 
-/* Slot 99 is reserved */
-/* Slot 100 */
+/* Slot 15 */
 void
 XConfigureWindow(d, w, i, x)
     Display* d;
@@ -1172,7 +1087,7 @@ XConfigureWindow(d, w, i, x)
     (tkIntXlibStubsPtr->xConfigureWindow)(d, w, i, x);
 }
 
-/* Slot 101 */
+/* Slot 16 */
 void
 XCopyArea(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4)
     Display* d;
@@ -1189,7 +1104,7 @@ XCopyArea(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4)
     (tkIntXlibStubsPtr->xCopyArea)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4);
 }
 
-/* Slot 102 */
+/* Slot 17 */
 void
 XCopyPlane(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul)
     Display* d;
@@ -1207,7 +1122,7 @@ XCopyPlane(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul)
     (tkIntXlibStubsPtr->xCopyPlane)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul);
 }
 
-/* Slot 103 */
+/* Slot 18 */
 void
 XDefineCursor(d, w, c)
     Display* d;
@@ -1217,8 +1132,7 @@ XDefineCursor(d, w, c)
     (tkIntXlibStubsPtr->xDefineCursor)(d, w, c);
 }
 
-/* Slot 104 is reserved */
-/* Slot 105 */
+/* Slot 19 */
 void
 XDestroyWindow(d, w)
     Display* d;
@@ -1227,7 +1141,7 @@ XDestroyWindow(d, w)
     (tkIntXlibStubsPtr->xDestroyWindow)(d, w);
 }
 
-/* Slot 106 */
+/* Slot 20 */
 void
 XDrawArc(d, dr, g, i1, i2, ui1, ui2, i3, i4)
     Display* d;
@@ -1243,7 +1157,7 @@ XDrawArc(d, dr, g, i1, i2, ui1, ui2, i3, i4)
     (tkIntXlibStubsPtr->xDrawArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4);
 }
 
-/* Slot 107 */
+/* Slot 21 */
 void
 XDrawLines(d, dr, g, x, i1, i2)
     Display* d;
@@ -1256,7 +1170,7 @@ XDrawLines(d, dr, g, x, i1, i2)
     (tkIntXlibStubsPtr->xDrawLines)(d, dr, g, x, i1, i2);
 }
 
-/* Slot 108 */
+/* Slot 22 */
 void
 XDrawRectangle(d, dr, g, i1, i2, ui1, ui2)
     Display* d;
@@ -1270,7 +1184,7 @@ XDrawRectangle(d, dr, g, i1, i2, ui1, ui2)
     (tkIntXlibStubsPtr->xDrawRectangle)(d, dr, g, i1, i2, ui1, ui2);
 }
 
-/* Slot 109 */
+/* Slot 23 */
 void
 XFillArc(d, dr, g, i1, i2, ui1, ui2, i3, i4)
     Display* d;
@@ -1286,7 +1200,7 @@ XFillArc(d, dr, g, i1, i2, ui1, ui2, i3, i4)
     (tkIntXlibStubsPtr->xFillArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4);
 }
 
-/* Slot 110 */
+/* Slot 24 */
 void
 XFillPolygon(d, dr, g, x, i1, i2, i3)
     Display* d;
@@ -1300,7 +1214,7 @@ XFillPolygon(d, dr, g, x, i1, i2, i3)
     (tkIntXlibStubsPtr->xFillPolygon)(d, dr, g, x, i1, i2, i3);
 }
 
-/* Slot 111 */
+/* Slot 25 */
 void
 XFillRectangles(d, dr, g, x, i)
     Display* d;
@@ -1312,8 +1226,7 @@ XFillRectangles(d, dr, g, x, i)
     (tkIntXlibStubsPtr->xFillRectangles)(d, dr, g, x, i);
 }
 
-/* Slot 112 is reserved */
-/* Slot 113 */
+/* Slot 26 */
 void
 XFreeColormap(d, c)
     Display* d;
@@ -1322,7 +1235,7 @@ XFreeColormap(d, c)
     (tkIntXlibStubsPtr->xFreeColormap)(d, c);
 }
 
-/* Slot 114 */
+/* Slot 27 */
 void
 XFreeColors(d, c, ulp, i, ul)
     Display* d;
@@ -1334,8 +1247,7 @@ XFreeColors(d, c, ulp, i, ul)
     (tkIntXlibStubsPtr->xFreeColors)(d, c, ulp, i, ul);
 }
 
-/* Slot 115 is reserved */
-/* Slot 116 */
+/* Slot 28 */
 void
 XFreeModifiermap(x)
     XModifierKeymap* x;
@@ -1343,7 +1255,7 @@ XFreeModifiermap(x)
     (tkIntXlibStubsPtr->xFreeModifiermap)(x);
 }
 
-/* Slot 117 */
+/* Slot 29 */
 Status
 XGetGeometry(d, dr, w, i1, i2, ui1, ui2, ui3, ui4)
     Display* d;
@@ -1359,8 +1271,7 @@ XGetGeometry(d, dr, w, i1, i2, ui1, ui2, ui3, ui4)
     return (tkIntXlibStubsPtr->xGetGeometry)(d, dr, w, i1, i2, ui1, ui2, ui3, ui4);
 }
 
-/* Slot 118 is reserved */
-/* Slot 119 */
+/* Slot 30 */
 int
 XGetWindowProperty(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp)
     Display* d;
@@ -1379,8 +1290,7 @@ XGetWindowProperty(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp)
     return (tkIntXlibStubsPtr->xGetWindowProperty)(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp);
 }
 
-/* Slot 120 is reserved */
-/* Slot 121 */
+/* Slot 31 */
 int
 XGrabKeyboard(d, w, b, i1, i2, t)
     Display* d;
@@ -1393,7 +1303,7 @@ XGrabKeyboard(d, w, b, i1, i2, t)
     return (tkIntXlibStubsPtr->xGrabKeyboard)(d, w, b, i1, i2, t);
 }
 
-/* Slot 122 */
+/* Slot 32 */
 int
 XGrabPointer(d, w1, b, ui, i1, i2, w2, c, t)
     Display* d;
@@ -1409,7 +1319,7 @@ XGrabPointer(d, w1, b, ui, i1, i2, w2, c, t)
     return (tkIntXlibStubsPtr->xGrabPointer)(d, w1, b, ui, i1, i2, w2, c, t);
 }
 
-/* Slot 123 */
+/* Slot 33 */
 KeyCode
 XKeysymToKeycode(d, k)
     Display* d;
@@ -1418,8 +1328,7 @@ XKeysymToKeycode(d, k)
     return (tkIntXlibStubsPtr->xKeysymToKeycode)(d, k);
 }
 
-/* Slot 124 is reserved */
-/* Slot 125 */
+/* Slot 34 */
 void
 XMapWindow(d, w)
     Display* d;
@@ -1428,7 +1337,7 @@ XMapWindow(d, w)
     (tkIntXlibStubsPtr->xMapWindow)(d, w);
 }
 
-/* Slot 126 */
+/* Slot 35 */
 void
 XMoveResizeWindow(d, w, i1, i2, ui1, ui2)
     Display* d;
@@ -1441,7 +1350,7 @@ XMoveResizeWindow(d, w, i1, i2, ui1, ui2)
     (tkIntXlibStubsPtr->xMoveResizeWindow)(d, w, i1, i2, ui1, ui2);
 }
 
-/* Slot 127 */
+/* Slot 36 */
 void
 XMoveWindow(d, w, i1, i2)
     Display* d;
@@ -1452,10 +1361,7 @@ XMoveWindow(d, w, i1, i2)
     (tkIntXlibStubsPtr->xMoveWindow)(d, w, i1, i2);
 }
 
-/* Slot 128 is reserved */
-/* Slot 129 is reserved */
-/* Slot 130 is reserved */
-/* Slot 131 */
+/* Slot 37 */
 Bool
 XQueryPointer(d, w1, w2, w3, i1, i2, i3, i4, ui)
     Display* d;
@@ -1471,8 +1377,7 @@ XQueryPointer(d, w1, w2, w3, i1, i2, i3, i4, ui)
     return (tkIntXlibStubsPtr->xQueryPointer)(d, w1, w2, w3, i1, i2, i3, i4, ui);
 }
 
-/* Slot 132 is reserved */
-/* Slot 133 */
+/* Slot 38 */
 void
 XRaiseWindow(d, w)
     Display* d;
@@ -1481,7 +1386,7 @@ XRaiseWindow(d, w)
     (tkIntXlibStubsPtr->xRaiseWindow)(d, w);
 }
 
-/* Slot 134 */
+/* Slot 39 */
 void
 XRefreshKeyboardMapping(x)
     XMappingEvent* x;
@@ -1489,7 +1394,7 @@ XRefreshKeyboardMapping(x)
     (tkIntXlibStubsPtr->xRefreshKeyboardMapping)(x);
 }
 
-/* Slot 135 */
+/* Slot 40 */
 void
 XResizeWindow(d, w, ui1, ui2)
     Display* d;
@@ -1500,7 +1405,7 @@ XResizeWindow(d, w, ui1, ui2)
     (tkIntXlibStubsPtr->xResizeWindow)(d, w, ui1, ui2);
 }
 
-/* Slot 136 */
+/* Slot 41 */
 void
 XSelectInput(d, w, l)
     Display* d;
@@ -1510,7 +1415,7 @@ XSelectInput(d, w, l)
     (tkIntXlibStubsPtr->xSelectInput)(d, w, l);
 }
 
-/* Slot 137 */
+/* Slot 42 */
 Status
 XSendEvent(d, w, b, l, x)
     Display* d;
@@ -1522,8 +1427,7 @@ XSendEvent(d, w, b, l, x)
     return (tkIntXlibStubsPtr->xSendEvent)(d, w, b, l, x);
 }
 
-/* Slot 138 is reserved */
-/* Slot 139 */
+/* Slot 43 */
 void
 XSetIconName(d, w, c)
     Display* d;
@@ -1533,7 +1437,7 @@ XSetIconName(d, w, c)
     (tkIntXlibStubsPtr->xSetIconName)(d, w, c);
 }
 
-/* Slot 140 */
+/* Slot 44 */
 void
 XSetInputFocus(d, w, i, t)
     Display* d;
@@ -1544,7 +1448,7 @@ XSetInputFocus(d, w, i, t)
     (tkIntXlibStubsPtr->xSetInputFocus)(d, w, i, t);
 }
 
-/* Slot 141 */
+/* Slot 45 */
 void
 XSetSelectionOwner(d, a, w, t)
     Display* d;
@@ -1555,7 +1459,7 @@ XSetSelectionOwner(d, a, w, t)
     (tkIntXlibStubsPtr->xSetSelectionOwner)(d, a, w, t);
 }
 
-/* Slot 142 */
+/* Slot 46 */
 void
 XSetWindowBackground(d, w, ul)
     Display* d;
@@ -1565,7 +1469,7 @@ XSetWindowBackground(d, w, ul)
     (tkIntXlibStubsPtr->xSetWindowBackground)(d, w, ul);
 }
 
-/* Slot 143 */
+/* Slot 47 */
 void
 XSetWindowBackgroundPixmap(d, w, p)
     Display* d;
@@ -1575,7 +1479,7 @@ XSetWindowBackgroundPixmap(d, w, p)
     (tkIntXlibStubsPtr->xSetWindowBackgroundPixmap)(d, w, p);
 }
 
-/* Slot 144 */
+/* Slot 48 */
 void
 XSetWindowBorder(d, w, ul)
     Display* d;
@@ -1585,7 +1489,7 @@ XSetWindowBorder(d, w, ul)
     (tkIntXlibStubsPtr->xSetWindowBorder)(d, w, ul);
 }
 
-/* Slot 145 */
+/* Slot 49 */
 void
 XSetWindowBorderPixmap(d, w, p)
     Display* d;
@@ -1595,7 +1499,7 @@ XSetWindowBorderPixmap(d, w, p)
     (tkIntXlibStubsPtr->xSetWindowBorderPixmap)(d, w, p);
 }
 
-/* Slot 146 */
+/* Slot 50 */
 void
 XSetWindowBorderWidth(d, w, ui)
     Display* d;
@@ -1605,7 +1509,7 @@ XSetWindowBorderWidth(d, w, ui)
     (tkIntXlibStubsPtr->xSetWindowBorderWidth)(d, w, ui);
 }
 
-/* Slot 147 */
+/* Slot 51 */
 void
 XSetWindowColormap(d, w, c)
     Display* d;
@@ -1615,8 +1519,7 @@ XSetWindowColormap(d, w, c)
     (tkIntXlibStubsPtr->xSetWindowColormap)(d, w, c);
 }
 
-/* Slot 148 is reserved */
-/* Slot 149 */
+/* Slot 52 */
 void
 XUngrabKeyboard(d, t)
     Display* d;
@@ -1625,7 +1528,7 @@ XUngrabKeyboard(d, t)
     (tkIntXlibStubsPtr->xUngrabKeyboard)(d, t);
 }
 
-/* Slot 150 */
+/* Slot 53 */
 void
 XUngrabPointer(d, t)
     Display* d;
@@ -1634,7 +1537,7 @@ XUngrabPointer(d, t)
     (tkIntXlibStubsPtr->xUngrabPointer)(d, t);
 }
 
-/* Slot 151 */
+/* Slot 54 */
 void
 XUnmapWindow(d, w)
     Display* d;
@@ -1643,11 +1546,7 @@ XUnmapWindow(d, w)
     (tkIntXlibStubsPtr->xUnmapWindow)(d, w);
 }
 
-/* Slot 152 is reserved */
-/* Slot 153 is reserved */
-/* Slot 154 is reserved */
-/* Slot 155 is reserved */
-/* Slot 156 */
+/* Slot 55 */
 void
 TkPutImage(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height)
     unsigned long * colors;
diff --git a/generic/tkMain.c b/generic/tkMain.c
index abbcb7b..eccdab2 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMain.c,v 1.2.4.2 1999/03/06 23:18:05 stanton Exp $
+ * RCS: @(#) $Id: tkMain.c,v 1.2.4.3 1999/03/07 00:15:45 redman Exp $
  */
 
 #include <ctype.h>
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <tcl.h>
 #include <tk.h>
+#include "tkInt.h"
 #ifdef NO_STDLIB_H
 #   include "../compat/stdlib.h"
 #else
@@ -36,8 +37,10 @@
  * some systems.
  */
 
-extern int		isatty _ANSI_ARGS_((int fd));
+void	TkConsoleCreate_ _ANSI_ARGS_((void));
+
 #if !defined(__WIN32__) && !defined(_WIN32)
+extern int		isatty _ANSI_ARGS_((int fd));
 extern char *		strrchr _ANSI_ARGS_((CONST char *string, int c));
 #endif
 extern void		TkpDisplayWarning _ANSI_ARGS_((char *msg,
@@ -92,7 +95,7 @@ Tk_Main(argc, argv, appInitProc)
 					 * initialization but before starting
 					 * to execute commands. */
 {
-    TkMain(argc, argv, appInitProc, Tcl_CreateInterp());
+    Tk_MainEx(argc, argv, appInitProc, Tcl_CreateInterp());
 }
 
 void
@@ -113,10 +116,10 @@ Tk_MainEx(argc, argv, appInitProc, interp)
 
     /*
      * Make sure that Tcl is present. If using stubs this will initialize the
-     * stub table pointers.
+     * stub table pointers.  (for 8.1, noop in 8.0.x)
      */
 
-    if (Tcl_Required (interp, NULL, 0) == NULL) {
+    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
 	abort();
     }
     
diff --git a/generic/tkPlatStubs.c b/generic/tkPlatStubs.c
index 6e2c655..aa30b73 100644
--- a/generic/tkPlatStubs.c
+++ b/generic/tkPlatStubs.c
@@ -7,11 +7,15 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkPlatStubs.c,v 1.1.2.1 1999/03/06 00:08:06 redman Exp $
+ * RCS: @(#) $Id: tkPlatStubs.c,v 1.1.2.2 1999/03/07 00:15:45 redman Exp $
  */
 
 #include "tk.h"
 
+#ifdef __WIN32__
+#include "tkWinInt.h"
+#endif
+
 /*
  * WARNING: This file is automatically generated by the tools/genStubs.tcl
  * script.  Any modifications to the function declarations below should be made
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index a6e8c18..6e1da97 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -8,11 +8,16 @@
  * 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.1.2.3 1999/03/06 02:23:17 redman Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.1.2.4 1999/03/07 00:15:45 redman Exp $
  */
 
 #include "tkInt.h"
 #include "tkPort.h"
+
+#ifdef __WIN32__
+#include "tkWinInt.h"
+#endif
+
 #include "tkDecls.h"
 #include "tkPlatDecls.h"
 #include "tkIntDecls.h"
@@ -157,74 +162,73 @@ TkStubs tkStubs = {
     Tk_Init, /* 118 */
     Tk_InternAtom, /* 119 */
     Tk_IntersectTextLayout, /* 120 */
-    Tk_Main, /* 121 */
-    Tk_MaintainGeometry, /* 122 */
-    Tk_MainWindow, /* 123 */
-    Tk_MakeWindowExist, /* 124 */
-    Tk_ManageGeometry, /* 125 */
-    Tk_MapWindow, /* 126 */
-    Tk_MeasureChars, /* 127 */
-    Tk_MoveResizeWindow, /* 128 */
-    Tk_MoveWindow, /* 129 */
-    Tk_MoveToplevelWindow, /* 130 */
-    Tk_NameOf3DBorder, /* 131 */
-    Tk_NameOfAnchor, /* 132 */
-    Tk_NameOfBitmap, /* 133 */
-    Tk_NameOfCapStyle, /* 134 */
-    Tk_NameOfColor, /* 135 */
-    Tk_NameOfCursor, /* 136 */
-    Tk_NameOfFont, /* 137 */
-    Tk_NameOfImage, /* 138 */
-    Tk_NameOfJoinStyle, /* 139 */
-    Tk_NameOfJustify, /* 140 */
-    Tk_NameOfRelief, /* 141 */
-    Tk_NameToWindow, /* 142 */
-    Tk_OwnSelection, /* 143 */
-    Tk_ParseArgv, /* 144 */
-    Tk_PhotoPutBlock, /* 145 */
-    Tk_PhotoPutZoomedBlock, /* 146 */
-    Tk_PhotoGetImage, /* 147 */
-    Tk_PhotoBlank, /* 148 */
-    Tk_PhotoExpand, /* 149 */
-    Tk_PhotoGetSize, /* 150 */
-    Tk_PhotoSetSize, /* 151 */
-    Tk_PointToChar, /* 152 */
-    Tk_PostscriptFontName, /* 153 */
-    Tk_PreserveColormap, /* 154 */
-    Tk_QueueWindowEvent, /* 155 */
-    Tk_RedrawImage, /* 156 */
-    Tk_ResizeWindow, /* 157 */
-    Tk_RestackWindow, /* 158 */
-    Tk_RestrictEvents, /* 159 */
-    Tk_SafeInit, /* 160 */
-    Tk_SetAppName, /* 161 */
-    Tk_SetBackgroundFromBorder, /* 162 */
-    Tk_SetClass, /* 163 */
-    Tk_SetGrid, /* 164 */
-    Tk_SetInternalBorder, /* 165 */
-    Tk_SetWindowBackground, /* 166 */
-    Tk_SetWindowBackgroundPixmap, /* 167 */
-    Tk_SetWindowBorder, /* 168 */
-    Tk_SetWindowBorderWidth, /* 169 */
-    Tk_SetWindowBorderPixmap, /* 170 */
-    Tk_SetWindowColormap, /* 171 */
-    Tk_SetWindowVisual, /* 172 */
-    Tk_SizeOfBitmap, /* 173 */
-    Tk_SizeOfImage, /* 174 */
-    Tk_StrictMotif, /* 175 */
-    Tk_TextLayoutToPostscript, /* 176 */
-    Tk_TextWidth, /* 177 */
-    Tk_UndefineCursor, /* 178 */
-    Tk_UnderlineChars, /* 179 */
-    Tk_UnderlineTextLayout, /* 180 */
-    Tk_Ungrab, /* 181 */
-    Tk_UnmaintainGeometry, /* 182 */
-    Tk_UnmapWindow, /* 183 */
-    Tk_UnsetGrid, /* 184 */
-    Tk_UpdatePointer, /* 185 */
+    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 */
 };
 
-extern TkStubs *tkStubsPtr = &tkStubs;
+TkStubs *tkStubsPtr = &tkStubs;
 
 TkIntStubs tkIntStubs = {
     TCL_STUB_MAGIC,
@@ -329,7 +333,7 @@ TkIntStubs tkIntStubs = {
     TkWmUnmapWindow, /* 97 */
 };
 
-extern TkIntStubs *tkIntStubsPtr = &tkIntStubs;
+TkIntStubs *tkIntStubsPtr = &tkIntStubs;
 
 TkIntPlatStubs tkIntPlatStubs = {
     TCL_STUB_MAGIC,
@@ -345,41 +349,32 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkPointerDeadWindow, /* 7 */
     TkpPrintWindowId, /* 8 */
     TkpScanWindowId, /* 9 */
-    NULL, /* 10 */
-    TkpSetCapture, /* 11 */
-    TkpSetCursor, /* 12 */
-    TkpWmSetState, /* 13 */
-    TkRectInRegion, /* 14 */
-    TkSetPixmapColormap, /* 15 */
-    TkSetRegion, /* 16 */
-    TkUnionRectWithRegion, /* 17 */
-    TkWinCancelMouseTimer, /* 18 */
-    NULL, /* 19 */
-    TkWinClipboardRender, /* 20 */
-    TkWinEmbeddedEventProc, /* 21 */
-    TkWinFillRect, /* 22 */
-    TkWinGetBorderPixels, /* 23 */
-    TkWinGetDrawableDC, /* 24 */
-    TkWinGetModifierState, /* 25 */
-    TkWinGetSystemPalette, /* 26 */
-    TkWinGetWrapperWindow, /* 27 */
-    TkWinHandleMenuEvent, /* 28 */
-    TkWinIndexOfColor, /* 29 */
-    TkWinPointerDeadWindow, /* 30 */
-    TkWinPointerEvent, /* 31 */
-    TkWinPointerInit, /* 32 */
-    TkWinReflectMessage, /* 33 */
-    TkWinReleaseDrawableDC, /* 34 */
-    TkWinResendEvent, /* 35 */
-    TkWinSelectPalette, /* 36 */
-    TkWinSetMenu, /* 37 */
-    TkWinSetWindowPos, /* 38 */
-    TkWinUpdateCursor, /* 39 */
-    TkWinWmCleanup, /* 40 */
-    TkWinWmFindEmbedAssociation, /* 41 */
-    TkWinWmStoreEmbedAssociation, /* 42 */
-    TkWinXCleanup, /* 43 */
-    TkWinXInit, /* 44 */
+    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 */
 #endif /* __WIN32__ */
 #if !defined(__WIN32__) && !defined(MAC_TCL)
     TkCreateXEventSource, /* 0 */
@@ -404,71 +399,70 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkPointerDeadWindow, /* 9 */
     TkpSetCapture, /* 10 */
     TkpSetCursor, /* 11 */
-    NULL, /* 12 */
-    TkpWmSetState, /* 13 */
-    TkRectInRegion, /* 14 */
-    TkSetRegion, /* 15 */
-    TkUnionRectWithRegion, /* 16 */
-    HandleWMEvent, /* 17 */
-    TkAboutDlg, /* 18 */
-    TkCreateMacEventSource, /* 19 */
-    TkFontList, /* 20 */
-    TkGetTransientMaster, /* 21 */
-    TkGenerateButtonEvent, /* 22 */
-    TkGetCharPositions, /* 23 */
-    TkGenWMDestroyEvent, /* 24 */
-    TkGenWMConfigureEvent, /* 25 */
-    TkMacButtonKeyState, /* 26 */
-    TkMacClearMenubarActive, /* 27 */
-    TkMacConvertEvent, /* 28 */
-    TkMacDispatchMenuEvent, /* 29 */
-    TkMacInstallCursor, /* 30 */
-    TkMacConvertTkEvent, /* 31 */
-    TkMacHandleTearoffMenu, /* 32 */
-    tkMacInstallMWConsole, /* 33 */
-    TkMacInvalClipRgns, /* 34 */
-    TkMacDoHLEvent, /* 35 */
-    TkMacFontInfo, /* 36 */
-    TkMacGenerateTime, /* 37 */
-    TkMacGetDrawablePort, /* 38 */
-    TkMacGetScrollbarGrowWindow, /* 39 */
-    TkMacGetXWindow, /* 40 */
-    TkMacGrowToplevel, /* 41 */
-    TkMacHandleMenuSelect, /* 42 */
-    TkMacHaveAppearance, /* 43 */
-    TkMacInitAppleEvents, /* 44 */
-    TkMacInitMenus, /* 45 */
-    TkMacInvalidateWindow, /* 46 */
-    TkMacIsCharacterMissing, /* 47 */
-    TkMacMakeRealWindowExist, /* 48 */
-    TkMacMakeStippleMap, /* 49 */
-    TkMacMenuClick, /* 50 */
-    TkMacRegisterOffScreenWindow, /* 51 */
-    TkMacResizable, /* 52 */
-    TkMacSetEmbedRgn, /* 53 */
-    TkMacSetHelpMenuItemCount, /* 54 */
-    TkMacSetScrollbarGrow, /* 55 */
-    TkMacSetUpClippingRgn, /* 56 */
-    TkMacSetUpGraphicsPort, /* 57 */
-    TkMacUpdateClipRgn, /* 58 */
-    TkMacUnregisterMacWindow, /* 59 */
-    TkMacUseMenuID, /* 60 */
-    TkMacVisableClipRgn, /* 61 */
-    TkMacWinBounds, /* 62 */
-    TkMacWindowOffset, /* 63 */
-    TkResumeClipboard, /* 64 */
-    TkSetMacColor, /* 65 */
-    TkSetWMName, /* 66 */
-    TkSuspendClipboard, /* 67 */
-    TkWMGrowToplevel, /* 68 */
-    TkMacZoomToplevel, /* 69 */
-    Tk_TopCoordsToWindow, /* 70 */
-    TkMacContainerId, /* 71 */
-    TkMacGetHostToplevel, /* 72 */
+    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 */
 #endif /* MAC_TCL */
 };
 
-extern TkIntPlatStubs *tkIntPlatStubsPtr = &tkIntPlatStubs;
+TkIntPlatStubs *tkIntPlatStubsPtr = &tkIntPlatStubs;
 
 TkIntXlibStubs tkIntXlibStubs = {
     TCL_STUB_MAGIC,
@@ -555,167 +549,66 @@ TkIntXlibStubs tkIntXlibStubs = {
     TkPutImage, /* 78 */
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
-    NULL, /* 0 */
-    NULL, /* 1 */
-    NULL, /* 2 */
-    NULL, /* 3 */
-    NULL, /* 4 */
-    NULL, /* 5 */
-    NULL, /* 6 */
-    NULL, /* 7 */
-    NULL, /* 8 */
-    NULL, /* 9 */
-    NULL, /* 10 */
-    NULL, /* 11 */
-    NULL, /* 12 */
-    NULL, /* 13 */
-    NULL, /* 14 */
-    NULL, /* 15 */
-    NULL, /* 16 */
-    NULL, /* 17 */
-    NULL, /* 18 */
-    NULL, /* 19 */
-    NULL, /* 20 */
-    NULL, /* 21 */
-    NULL, /* 22 */
-    NULL, /* 23 */
-    NULL, /* 24 */
-    NULL, /* 25 */
-    NULL, /* 26 */
-    NULL, /* 27 */
-    NULL, /* 28 */
-    NULL, /* 29 */
-    NULL, /* 30 */
-    NULL, /* 31 */
-    NULL, /* 32 */
-    NULL, /* 33 */
-    NULL, /* 34 */
-    NULL, /* 35 */
-    NULL, /* 36 */
-    NULL, /* 37 */
-    NULL, /* 38 */
-    NULL, /* 39 */
-    NULL, /* 40 */
-    NULL, /* 41 */
-    NULL, /* 42 */
-    NULL, /* 43 */
-    NULL, /* 44 */
-    NULL, /* 45 */
-    NULL, /* 46 */
-    NULL, /* 47 */
-    NULL, /* 48 */
-    NULL, /* 49 */
-    NULL, /* 50 */
-    NULL, /* 51 */
-    NULL, /* 52 */
-    NULL, /* 53 */
-    NULL, /* 54 */
-    NULL, /* 55 */
-    NULL, /* 56 */
-    NULL, /* 57 */
-    NULL, /* 58 */
-    NULL, /* 59 */
-    NULL, /* 60 */
-    NULL, /* 61 */
-    NULL, /* 62 */
-    NULL, /* 63 */
-    NULL, /* 64 */
-    NULL, /* 65 */
-    NULL, /* 66 */
-    NULL, /* 67 */
-    NULL, /* 68 */
-    NULL, /* 69 */
-    NULL, /* 70 */
-    NULL, /* 71 */
-    NULL, /* 72 */
-    NULL, /* 73 */
-    NULL, /* 74 */
-    NULL, /* 75 */
-    NULL, /* 76 */
-    NULL, /* 77 */
-    XGetModifierMapping, /* 78 */
-    XCreateImage, /* 79 */
-    XGetImage, /* 80 */
-    XGetAtomName, /* 81 */
-    XKeysymToString, /* 82 */
-    XCreateColormap, /* 83 */
-    NULL, /* 84 */
-    NULL, /* 85 */
-    XGContextFromGC, /* 86 */
-    NULL, /* 87 */
-    XKeycodeToKeysym, /* 88 */
-    XStringToKeysym, /* 89 */
-    XRootWindow, /* 90 */
-    XSetErrorHandler, /* 91 */
-    NULL, /* 92 */
-    NULL, /* 93 */
-    NULL, /* 94 */
-    XAllocColor, /* 95 */
-    XBell, /* 96 */
-    XChangeProperty, /* 97 */
-    XChangeWindowAttributes, /* 98 */
-    NULL, /* 99 */
-    XConfigureWindow, /* 100 */
-    XCopyArea, /* 101 */
-    XCopyPlane, /* 102 */
-    XDefineCursor, /* 103 */
-    NULL, /* 104 */
-    XDestroyWindow, /* 105 */
-    XDrawArc, /* 106 */
-    XDrawLines, /* 107 */
-    XDrawRectangle, /* 108 */
-    XFillArc, /* 109 */
-    XFillPolygon, /* 110 */
-    XFillRectangles, /* 111 */
-    NULL, /* 112 */
-    XFreeColormap, /* 113 */
-    XFreeColors, /* 114 */
-    NULL, /* 115 */
-    XFreeModifiermap, /* 116 */
-    XGetGeometry, /* 117 */
-    NULL, /* 118 */
-    XGetWindowProperty, /* 119 */
-    NULL, /* 120 */
-    XGrabKeyboard, /* 121 */
-    XGrabPointer, /* 122 */
-    XKeysymToKeycode, /* 123 */
-    NULL, /* 124 */
-    XMapWindow, /* 125 */
-    XMoveResizeWindow, /* 126 */
-    XMoveWindow, /* 127 */
-    NULL, /* 128 */
-    NULL, /* 129 */
-    NULL, /* 130 */
-    XQueryPointer, /* 131 */
-    NULL, /* 132 */
-    XRaiseWindow, /* 133 */
-    XRefreshKeyboardMapping, /* 134 */
-    XResizeWindow, /* 135 */
-    XSelectInput, /* 136 */
-    XSendEvent, /* 137 */
-    NULL, /* 138 */
-    XSetIconName, /* 139 */
-    XSetInputFocus, /* 140 */
-    XSetSelectionOwner, /* 141 */
-    XSetWindowBackground, /* 142 */
-    XSetWindowBackgroundPixmap, /* 143 */
-    XSetWindowBorder, /* 144 */
-    XSetWindowBorderPixmap, /* 145 */
-    XSetWindowBorderWidth, /* 146 */
-    XSetWindowColormap, /* 147 */
-    NULL, /* 148 */
-    XUngrabKeyboard, /* 149 */
-    XUngrabPointer, /* 150 */
-    XUnmapWindow, /* 151 */
-    NULL, /* 152 */
-    NULL, /* 153 */
-    NULL, /* 154 */
-    NULL, /* 155 */
-    TkPutImage, /* 156 */
+    XGetModifierMapping, /* 0 */
+    XCreateImage, /* 1 */
+    XGetImage, /* 2 */
+    XGetAtomName, /* 3 */
+    XKeysymToString, /* 4 */
+    XCreateColormap, /* 5 */
+    XGContextFromGC, /* 6 */
+    XKeycodeToKeysym, /* 7 */
+    XStringToKeysym, /* 8 */
+    XRootWindow, /* 9 */
+    XSetErrorHandler, /* 10 */
+    XAllocColor, /* 11 */
+    XBell, /* 12 */
+    XChangeProperty, /* 13 */
+    XChangeWindowAttributes, /* 14 */
+    XConfigureWindow, /* 15 */
+    XCopyArea, /* 16 */
+    XCopyPlane, /* 17 */
+    XDefineCursor, /* 18 */
+    XDestroyWindow, /* 19 */
+    XDrawArc, /* 20 */
+    XDrawLines, /* 21 */
+    XDrawRectangle, /* 22 */
+    XFillArc, /* 23 */
+    XFillPolygon, /* 24 */
+    XFillRectangles, /* 25 */
+    XFreeColormap, /* 26 */
+    XFreeColors, /* 27 */
+    XFreeModifiermap, /* 28 */
+    XGetGeometry, /* 29 */
+    XGetWindowProperty, /* 30 */
+    XGrabKeyboard, /* 31 */
+    XGrabPointer, /* 32 */
+    XKeysymToKeycode, /* 33 */
+    XMapWindow, /* 34 */
+    XMoveResizeWindow, /* 35 */
+    XMoveWindow, /* 36 */
+    XQueryPointer, /* 37 */
+    XRaiseWindow, /* 38 */
+    XRefreshKeyboardMapping, /* 39 */
+    XResizeWindow, /* 40 */
+    XSelectInput, /* 41 */
+    XSendEvent, /* 42 */
+    XSetIconName, /* 43 */
+    XSetInputFocus, /* 44 */
+    XSetSelectionOwner, /* 45 */
+    XSetWindowBackground, /* 46 */
+    XSetWindowBackgroundPixmap, /* 47 */
+    XSetWindowBorder, /* 48 */
+    XSetWindowBorderPixmap, /* 49 */
+    XSetWindowBorderWidth, /* 50 */
+    XSetWindowColormap, /* 51 */
+    XUngrabKeyboard, /* 52 */
+    XUngrabPointer, /* 53 */
+    XUnmapWindow, /* 54 */
+    TkPutImage, /* 55 */
 #endif /* MAC_TCL */
 };
 
-extern TkIntXlibStubs *tkIntXlibStubsPtr = &tkIntXlibStubs;
+TkIntXlibStubs *tkIntXlibStubsPtr = &tkIntXlibStubs;
 
 TkPlatStubs tkPlatStubs = {
     TCL_STUB_MAGIC,
@@ -743,7 +636,7 @@ TkPlatStubs tkPlatStubs = {
 #endif /* MAC_TCL */
 };
 
-extern TkPlatStubs *tkPlatStubsPtr = &tkPlatStubs;
+TkPlatStubs *tkPlatStubsPtr = &tkPlatStubs;
 
 static TkStubHooks tkStubHooks = {
     &tkPlatStubs,
diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c
index 24342be..4f51265 100644
--- a/generic/tkStubLib.c
+++ b/generic/tkStubLib.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubLib.c,v 1.1.2.1 1999/03/06 23:07:51 stanton Exp $
+ * RCS: @(#) $Id: tkStubLib.c,v 1.1.2.2 1999/03/07 00:15:45 redman Exp $
  */
 
 /*
@@ -20,15 +20,25 @@
  * including the rest of the stub functions.
  */
 
+
 #ifndef USE_TK_STUBS
 #define USE_TK_STUBS
 #endif
 #undef USE_TK_STUB_PROCS
 
-#ifndef USE_TCL_STUBS
-#define USE_TCL_STUBS
+#include "tkInt.h"
+#include "tkPort.h"
+
+#ifdef __WIN32__
+#include "tkWinInt.h"
 #endif
 
+#include "tkDecls.h"
+#include "tkIntDecls.h"
+#include "tkPlatDecls.h"
+#include "tkIntPlatDecls.h"
+#include "tkIntXlibDecls.h"
+
 /*
  * Ensure that Tk_InitStubs is built as an exported symbol.  The other stub
  * functions should be built as non-exported symbols.
@@ -41,6 +51,7 @@ TkStubs *tkStubsPtr;
 TkPlatStubs *tkPlatStubsPtr;
 TkIntStubs *tkIntStubsPtr;
 TkIntPlatStubs *tkIntPlatStubsPtr;
+TkIntXlibStubs *tkIntXlibStubsPtr;
 
 
 /*
@@ -85,6 +96,7 @@ Tk_InitStubs(interp, version, exact)
     tkPlatStubsPtr = tkStubsPtr->hooks->tkPlatStubs;
     tkIntStubsPtr = tkStubsPtr->hooks->tkIntStubs;
     tkIntPlatStubsPtr = tkStubsPtr->hooks->tkIntPlatStubs;
+    tkIntXlibStubsPtr = tkStubsPtr->hooks->tkIntXlibStubs;
     
     return actualVersion;
 }
diff --git a/generic/tkStubs.c b/generic/tkStubs.c
index 2bba819..94f4521 100644
--- a/generic/tkStubs.c
+++ b/generic/tkStubs.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubs.c,v 1.1.2.1 1999/03/06 00:08:07 redman Exp $
+ * RCS: @(#) $Id: tkStubs.c,v 1.1.2.2 1999/03/07 00:15:45 redman Exp $
  */
 
 #include "tk.h"
@@ -1305,16 +1305,6 @@ Tk_IntersectTextLayout(layout, x, y, width, height)
 
 /* Slot 121 */
 void
-Tk_Main(argc, argv, appInitProc)
-    int argc;
-    char ** argv;
-    Tcl_AppInitProc * appInitProc;
-{
-    (tkStubsPtr->tk_Main)(argc, argv, appInitProc);
-}
-
-/* Slot 122 */
-void
 Tk_MaintainGeometry(slave, master, x, y, width, height)
     Tk_Window slave;
     Tk_Window master;
@@ -1326,7 +1316,7 @@ Tk_MaintainGeometry(slave, master, x, y, width, height)
     (tkStubsPtr->tk_MaintainGeometry)(slave, master, x, y, width, height);
 }
 
-/* Slot 123 */
+/* Slot 122 */
 Tk_Window
 Tk_MainWindow(interp)
     Tcl_Interp * interp;
@@ -1334,7 +1324,7 @@ Tk_MainWindow(interp)
     return (tkStubsPtr->tk_MainWindow)(interp);
 }
 
-/* Slot 124 */
+/* Slot 123 */
 void
 Tk_MakeWindowExist(tkwin)
     Tk_Window tkwin;
@@ -1342,7 +1332,7 @@ Tk_MakeWindowExist(tkwin)
     (tkStubsPtr->tk_MakeWindowExist)(tkwin);
 }
 
-/* Slot 125 */
+/* Slot 124 */
 void
 Tk_ManageGeometry(tkwin, mgrPtr, clientData)
     Tk_Window tkwin;
@@ -1352,7 +1342,7 @@ Tk_ManageGeometry(tkwin, mgrPtr, clientData)
     (tkStubsPtr->tk_ManageGeometry)(tkwin, mgrPtr, clientData);
 }
 
-/* Slot 126 */
+/* Slot 125 */
 void
 Tk_MapWindow(tkwin)
     Tk_Window tkwin;
@@ -1360,7 +1350,7 @@ Tk_MapWindow(tkwin)
     (tkStubsPtr->tk_MapWindow)(tkwin);
 }
 
-/* Slot 127 */
+/* Slot 126 */
 int
 Tk_MeasureChars(tkfont, source, maxChars, maxPixels, flags, lengthPtr)
     Tk_Font tkfont;
@@ -1373,7 +1363,7 @@ Tk_MeasureChars(tkfont, source, maxChars, maxPixels, flags, lengthPtr)
     return (tkStubsPtr->tk_MeasureChars)(tkfont, source, maxChars, maxPixels, flags, lengthPtr);
 }
 
-/* Slot 128 */
+/* Slot 127 */
 void
 Tk_MoveResizeWindow(tkwin, x, y, width, height)
     Tk_Window tkwin;
@@ -1385,7 +1375,7 @@ Tk_MoveResizeWindow(tkwin, x, y, width, height)
     (tkStubsPtr->tk_MoveResizeWindow)(tkwin, x, y, width, height);
 }
 
-/* Slot 129 */
+/* Slot 128 */
 void
 Tk_MoveWindow(tkwin, x, y)
     Tk_Window tkwin;
@@ -1395,7 +1385,7 @@ Tk_MoveWindow(tkwin, x, y)
     (tkStubsPtr->tk_MoveWindow)(tkwin, x, y);
 }
 
-/* Slot 130 */
+/* Slot 129 */
 void
 Tk_MoveToplevelWindow(tkwin, x, y)
     Tk_Window tkwin;
@@ -1405,7 +1395,7 @@ Tk_MoveToplevelWindow(tkwin, x, y)
     (tkStubsPtr->tk_MoveToplevelWindow)(tkwin, x, y);
 }
 
-/* Slot 131 */
+/* Slot 130 */
 char *
 Tk_NameOf3DBorder(border)
     Tk_3DBorder border;
@@ -1413,7 +1403,7 @@ Tk_NameOf3DBorder(border)
     return (tkStubsPtr->tk_NameOf3DBorder)(border);
 }
 
-/* Slot 132 */
+/* Slot 131 */
 char *
 Tk_NameOfAnchor(anchor)
     Tk_Anchor anchor;
@@ -1421,7 +1411,7 @@ Tk_NameOfAnchor(anchor)
     return (tkStubsPtr->tk_NameOfAnchor)(anchor);
 }
 
-/* Slot 133 */
+/* Slot 132 */
 char *
 Tk_NameOfBitmap(display, bitmap)
     Display * display;
@@ -1430,7 +1420,7 @@ Tk_NameOfBitmap(display, bitmap)
     return (tkStubsPtr->tk_NameOfBitmap)(display, bitmap);
 }
 
-/* Slot 134 */
+/* Slot 133 */
 char *
 Tk_NameOfCapStyle(cap)
     int cap;
@@ -1438,7 +1428,7 @@ Tk_NameOfCapStyle(cap)
     return (tkStubsPtr->tk_NameOfCapStyle)(cap);
 }
 
-/* Slot 135 */
+/* Slot 134 */
 char *
 Tk_NameOfColor(colorPtr)
     XColor * colorPtr;
@@ -1446,7 +1436,7 @@ Tk_NameOfColor(colorPtr)
     return (tkStubsPtr->tk_NameOfColor)(colorPtr);
 }
 
-/* Slot 136 */
+/* Slot 135 */
 char *
 Tk_NameOfCursor(display, cursor)
     Display * display;
@@ -1455,7 +1445,7 @@ Tk_NameOfCursor(display, cursor)
     return (tkStubsPtr->tk_NameOfCursor)(display, cursor);
 }
 
-/* Slot 137 */
+/* Slot 136 */
 char *
 Tk_NameOfFont(font)
     Tk_Font font;
@@ -1463,7 +1453,7 @@ Tk_NameOfFont(font)
     return (tkStubsPtr->tk_NameOfFont)(font);
 }
 
-/* Slot 138 */
+/* Slot 137 */
 char *
 Tk_NameOfImage(imageMaster)
     Tk_ImageMaster imageMaster;
@@ -1471,7 +1461,7 @@ Tk_NameOfImage(imageMaster)
     return (tkStubsPtr->tk_NameOfImage)(imageMaster);
 }
 
-/* Slot 139 */
+/* Slot 138 */
 char *
 Tk_NameOfJoinStyle(join)
     int join;
@@ -1479,7 +1469,7 @@ Tk_NameOfJoinStyle(join)
     return (tkStubsPtr->tk_NameOfJoinStyle)(join);
 }
 
-/* Slot 140 */
+/* Slot 139 */
 char *
 Tk_NameOfJustify(justify)
     Tk_Justify justify;
@@ -1487,7 +1477,7 @@ Tk_NameOfJustify(justify)
     return (tkStubsPtr->tk_NameOfJustify)(justify);
 }
 
-/* Slot 141 */
+/* Slot 140 */
 char *
 Tk_NameOfRelief(relief)
     int relief;
@@ -1495,7 +1485,7 @@ Tk_NameOfRelief(relief)
     return (tkStubsPtr->tk_NameOfRelief)(relief);
 }
 
-/* Slot 142 */
+/* Slot 141 */
 Tk_Window
 Tk_NameToWindow(interp, pathName, tkwin)
     Tcl_Interp * interp;
@@ -1505,7 +1495,7 @@ Tk_NameToWindow(interp, pathName, tkwin)
     return (tkStubsPtr->tk_NameToWindow)(interp, pathName, tkwin);
 }
 
-/* Slot 143 */
+/* Slot 142 */
 void
 Tk_OwnSelection(tkwin, selection, proc, clientData)
     Tk_Window tkwin;
@@ -1516,7 +1506,7 @@ Tk_OwnSelection(tkwin, selection, proc, clientData)
     (tkStubsPtr->tk_OwnSelection)(tkwin, selection, proc, clientData);
 }
 
-/* Slot 144 */
+/* Slot 143 */
 int
 Tk_ParseArgv(interp, tkwin, argcPtr, argv, argTable, flags)
     Tcl_Interp * interp;
@@ -1529,7 +1519,7 @@ Tk_ParseArgv(interp, tkwin, argcPtr, argv, argTable, flags)
     return (tkStubsPtr->tk_ParseArgv)(interp, tkwin, argcPtr, argv, argTable, flags);
 }
 
-/* Slot 145 */
+/* Slot 144 */
 void
 Tk_PhotoPutBlock(handle, blockPtr, x, y, width, height)
     Tk_PhotoHandle handle;
@@ -1542,7 +1532,7 @@ Tk_PhotoPutBlock(handle, blockPtr, x, y, width, height)
     (tkStubsPtr->tk_PhotoPutBlock)(handle, blockPtr, x, y, width, height);
 }
 
-/* Slot 146 */
+/* Slot 145 */
 void
 Tk_PhotoPutZoomedBlock(handle, blockPtr, x, y, width, height, zoomX, zoomY, subsampleX, subsampleY)
     Tk_PhotoHandle handle;
@@ -1559,7 +1549,7 @@ Tk_PhotoPutZoomedBlock(handle, blockPtr, x, y, width, height, zoomX, zoomY, subs
     (tkStubsPtr->tk_PhotoPutZoomedBlock)(handle, blockPtr, x, y, width, height, zoomX, zoomY, subsampleX, subsampleY);
 }
 
-/* Slot 147 */
+/* Slot 146 */
 int
 Tk_PhotoGetImage(handle, blockPtr)
     Tk_PhotoHandle handle;
@@ -1568,7 +1558,7 @@ Tk_PhotoGetImage(handle, blockPtr)
     return (tkStubsPtr->tk_PhotoGetImage)(handle, blockPtr);
 }
 
-/* Slot 148 */
+/* Slot 147 */
 void
 Tk_PhotoBlank(handle)
     Tk_PhotoHandle handle;
@@ -1576,7 +1566,7 @@ Tk_PhotoBlank(handle)
     (tkStubsPtr->tk_PhotoBlank)(handle);
 }
 
-/* Slot 149 */
+/* Slot 148 */
 void
 Tk_PhotoExpand(handle, width, height)
     Tk_PhotoHandle handle;
@@ -1586,7 +1576,7 @@ Tk_PhotoExpand(handle, width, height)
     (tkStubsPtr->tk_PhotoExpand)(handle, width, height);
 }
 
-/* Slot 150 */
+/* Slot 149 */
 void
 Tk_PhotoGetSize(handle, widthPtr, heightPtr)
     Tk_PhotoHandle handle;
@@ -1596,7 +1586,7 @@ Tk_PhotoGetSize(handle, widthPtr, heightPtr)
     (tkStubsPtr->tk_PhotoGetSize)(handle, widthPtr, heightPtr);
 }
 
-/* Slot 151 */
+/* Slot 150 */
 void
 Tk_PhotoSetSize(handle, width, height)
     Tk_PhotoHandle handle;
@@ -1606,7 +1596,7 @@ Tk_PhotoSetSize(handle, width, height)
     (tkStubsPtr->tk_PhotoSetSize)(handle, width, height);
 }
 
-/* Slot 152 */
+/* Slot 151 */
 int
 Tk_PointToChar(layout, x, y)
     Tk_TextLayout layout;
@@ -1616,7 +1606,7 @@ Tk_PointToChar(layout, x, y)
     return (tkStubsPtr->tk_PointToChar)(layout, x, y);
 }
 
-/* Slot 153 */
+/* Slot 152 */
 int
 Tk_PostscriptFontName(tkfont, dsPtr)
     Tk_Font tkfont;
@@ -1625,7 +1615,7 @@ Tk_PostscriptFontName(tkfont, dsPtr)
     return (tkStubsPtr->tk_PostscriptFontName)(tkfont, dsPtr);
 }
 
-/* Slot 154 */
+/* Slot 153 */
 void
 Tk_PreserveColormap(display, colormap)
     Display * display;
@@ -1634,7 +1624,7 @@ Tk_PreserveColormap(display, colormap)
     (tkStubsPtr->tk_PreserveColormap)(display, colormap);
 }
 
-/* Slot 155 */
+/* Slot 154 */
 void
 Tk_QueueWindowEvent(eventPtr, position)
     XEvent * eventPtr;
@@ -1643,7 +1633,7 @@ Tk_QueueWindowEvent(eventPtr, position)
     (tkStubsPtr->tk_QueueWindowEvent)(eventPtr, position);
 }
 
-/* Slot 156 */
+/* Slot 155 */
 void
 Tk_RedrawImage(image, imageX, imageY, width, height, drawable, drawableX, drawableY)
     Tk_Image image;
@@ -1658,7 +1648,7 @@ Tk_RedrawImage(image, imageX, imageY, width, height, drawable, drawableX, drawab
     (tkStubsPtr->tk_RedrawImage)(image, imageX, imageY, width, height, drawable, drawableX, drawableY);
 }
 
-/* Slot 157 */
+/* Slot 156 */
 void
 Tk_ResizeWindow(tkwin, width, height)
     Tk_Window tkwin;
@@ -1668,7 +1658,7 @@ Tk_ResizeWindow(tkwin, width, height)
     (tkStubsPtr->tk_ResizeWindow)(tkwin, width, height);
 }
 
-/* Slot 158 */
+/* Slot 157 */
 int
 Tk_RestackWindow(tkwin, aboveBelow, other)
     Tk_Window tkwin;
@@ -1678,7 +1668,7 @@ Tk_RestackWindow(tkwin, aboveBelow, other)
     return (tkStubsPtr->tk_RestackWindow)(tkwin, aboveBelow, other);
 }
 
-/* Slot 159 */
+/* Slot 158 */
 Tk_RestrictProc *
 Tk_RestrictEvents(proc, arg, prevArgPtr)
     Tk_RestrictProc * proc;
@@ -1688,7 +1678,7 @@ Tk_RestrictEvents(proc, arg, prevArgPtr)
     return (tkStubsPtr->tk_RestrictEvents)(proc, arg, prevArgPtr);
 }
 
-/* Slot 160 */
+/* Slot 159 */
 int
 Tk_SafeInit(interp)
     Tcl_Interp * interp;
@@ -1696,7 +1686,7 @@ Tk_SafeInit(interp)
     return (tkStubsPtr->tk_SafeInit)(interp);
 }
 
-/* Slot 161 */
+/* Slot 160 */
 char *
 Tk_SetAppName(tkwin, name)
     Tk_Window tkwin;
@@ -1705,7 +1695,7 @@ Tk_SetAppName(tkwin, name)
     return (tkStubsPtr->tk_SetAppName)(tkwin, name);
 }
 
-/* Slot 162 */
+/* Slot 161 */
 void
 Tk_SetBackgroundFromBorder(tkwin, border)
     Tk_Window tkwin;
@@ -1714,7 +1704,7 @@ Tk_SetBackgroundFromBorder(tkwin, border)
     (tkStubsPtr->tk_SetBackgroundFromBorder)(tkwin, border);
 }
 
-/* Slot 163 */
+/* Slot 162 */
 void
 Tk_SetClass(tkwin, className)
     Tk_Window tkwin;
@@ -1723,7 +1713,7 @@ Tk_SetClass(tkwin, className)
     (tkStubsPtr->tk_SetClass)(tkwin, className);
 }
 
-/* Slot 164 */
+/* Slot 163 */
 void
 Tk_SetGrid(tkwin, reqWidth, reqHeight, gridWidth, gridHeight)
     Tk_Window tkwin;
@@ -1735,7 +1725,7 @@ Tk_SetGrid(tkwin, reqWidth, reqHeight, gridWidth, gridHeight)
     (tkStubsPtr->tk_SetGrid)(tkwin, reqWidth, reqHeight, gridWidth, gridHeight);
 }
 
-/* Slot 165 */
+/* Slot 164 */
 void
 Tk_SetInternalBorder(tkwin, width)
     Tk_Window tkwin;
@@ -1744,7 +1734,7 @@ Tk_SetInternalBorder(tkwin, width)
     (tkStubsPtr->tk_SetInternalBorder)(tkwin, width);
 }
 
-/* Slot 166 */
+/* Slot 165 */
 void
 Tk_SetWindowBackground(tkwin, pixel)
     Tk_Window tkwin;
@@ -1753,7 +1743,7 @@ Tk_SetWindowBackground(tkwin, pixel)
     (tkStubsPtr->tk_SetWindowBackground)(tkwin, pixel);
 }
 
-/* Slot 167 */
+/* Slot 166 */
 void
 Tk_SetWindowBackgroundPixmap(tkwin, pixmap)
     Tk_Window tkwin;
@@ -1762,7 +1752,7 @@ Tk_SetWindowBackgroundPixmap(tkwin, pixmap)
     (tkStubsPtr->tk_SetWindowBackgroundPixmap)(tkwin, pixmap);
 }
 
-/* Slot 168 */
+/* Slot 167 */
 void
 Tk_SetWindowBorder(tkwin, pixel)
     Tk_Window tkwin;
@@ -1771,7 +1761,7 @@ Tk_SetWindowBorder(tkwin, pixel)
     (tkStubsPtr->tk_SetWindowBorder)(tkwin, pixel);
 }
 
-/* Slot 169 */
+/* Slot 168 */
 void
 Tk_SetWindowBorderWidth(tkwin, width)
     Tk_Window tkwin;
@@ -1780,7 +1770,7 @@ Tk_SetWindowBorderWidth(tkwin, width)
     (tkStubsPtr->tk_SetWindowBorderWidth)(tkwin, width);
 }
 
-/* Slot 170 */
+/* Slot 169 */
 void
 Tk_SetWindowBorderPixmap(tkwin, pixmap)
     Tk_Window tkwin;
@@ -1789,7 +1779,7 @@ Tk_SetWindowBorderPixmap(tkwin, pixmap)
     (tkStubsPtr->tk_SetWindowBorderPixmap)(tkwin, pixmap);
 }
 
-/* Slot 171 */
+/* Slot 170 */
 void
 Tk_SetWindowColormap(tkwin, colormap)
     Tk_Window tkwin;
@@ -1798,7 +1788,7 @@ Tk_SetWindowColormap(tkwin, colormap)
     (tkStubsPtr->tk_SetWindowColormap)(tkwin, colormap);
 }
 
-/* Slot 172 */
+/* Slot 171 */
 int
 Tk_SetWindowVisual(tkwin, visual, depth, colormap)
     Tk_Window tkwin;
@@ -1809,7 +1799,7 @@ Tk_SetWindowVisual(tkwin, visual, depth, colormap)
     return (tkStubsPtr->tk_SetWindowVisual)(tkwin, visual, depth, colormap);
 }
 
-/* Slot 173 */
+/* Slot 172 */
 void
 Tk_SizeOfBitmap(display, bitmap, widthPtr, heightPtr)
     Display * display;
@@ -1820,7 +1810,7 @@ Tk_SizeOfBitmap(display, bitmap, widthPtr, heightPtr)
     (tkStubsPtr->tk_SizeOfBitmap)(display, bitmap, widthPtr, heightPtr);
 }
 
-/* Slot 174 */
+/* Slot 173 */
 void
 Tk_SizeOfImage(image, widthPtr, heightPtr)
     Tk_Image image;
@@ -1830,7 +1820,7 @@ Tk_SizeOfImage(image, widthPtr, heightPtr)
     (tkStubsPtr->tk_SizeOfImage)(image, widthPtr, heightPtr);
 }
 
-/* Slot 175 */
+/* Slot 174 */
 int
 Tk_StrictMotif(tkwin)
     Tk_Window tkwin;
@@ -1838,7 +1828,7 @@ Tk_StrictMotif(tkwin)
     return (tkStubsPtr->tk_StrictMotif)(tkwin);
 }
 
-/* Slot 176 */
+/* Slot 175 */
 void
 Tk_TextLayoutToPostscript(interp, layout)
     Tcl_Interp * interp;
@@ -1847,7 +1837,7 @@ Tk_TextLayoutToPostscript(interp, layout)
     (tkStubsPtr->tk_TextLayoutToPostscript)(interp, layout);
 }
 
-/* Slot 177 */
+/* Slot 176 */
 int
 Tk_TextWidth(font, string, numChars)
     Tk_Font font;
@@ -1857,7 +1847,7 @@ Tk_TextWidth(font, string, numChars)
     return (tkStubsPtr->tk_TextWidth)(font, string, numChars);
 }
 
-/* Slot 178 */
+/* Slot 177 */
 void
 Tk_UndefineCursor(window)
     Tk_Window window;
@@ -1865,7 +1855,7 @@ Tk_UndefineCursor(window)
     (tkStubsPtr->tk_UndefineCursor)(window);
 }
 
-/* Slot 179 */
+/* Slot 178 */
 void
 Tk_UnderlineChars(display, drawable, gc, tkfont, source, x, y, firstChar, lastChar)
     Display * display;
@@ -1881,7 +1871,7 @@ Tk_UnderlineChars(display, drawable, gc, tkfont, source, x, y, firstChar, lastCh
     (tkStubsPtr->tk_UnderlineChars)(display, drawable, gc, tkfont, source, x, y, firstChar, lastChar);
 }
 
-/* Slot 180 */
+/* Slot 179 */
 void
 Tk_UnderlineTextLayout(display, drawable, gc, layout, x, y, underline)
     Display * display;
@@ -1895,7 +1885,7 @@ Tk_UnderlineTextLayout(display, drawable, gc, layout, x, y, underline)
     (tkStubsPtr->tk_UnderlineTextLayout)(display, drawable, gc, layout, x, y, underline);
 }
 
-/* Slot 181 */
+/* Slot 180 */
 void
 Tk_Ungrab(tkwin)
     Tk_Window tkwin;
@@ -1903,7 +1893,7 @@ Tk_Ungrab(tkwin)
     (tkStubsPtr->tk_Ungrab)(tkwin);
 }
 
-/* Slot 182 */
+/* Slot 181 */
 void
 Tk_UnmaintainGeometry(slave, master)
     Tk_Window slave;
@@ -1912,7 +1902,7 @@ Tk_UnmaintainGeometry(slave, master)
     (tkStubsPtr->tk_UnmaintainGeometry)(slave, master);
 }
 
-/* Slot 183 */
+/* Slot 182 */
 void
 Tk_UnmapWindow(tkwin)
     Tk_Window tkwin;
@@ -1920,7 +1910,7 @@ Tk_UnmapWindow(tkwin)
     (tkStubsPtr->tk_UnmapWindow)(tkwin);
 }
 
-/* Slot 184 */
+/* Slot 183 */
 void
 Tk_UnsetGrid(tkwin)
     Tk_Window tkwin;
@@ -1928,7 +1918,7 @@ Tk_UnsetGrid(tkwin)
     (tkStubsPtr->tk_UnsetGrid)(tkwin);
 }
 
-/* Slot 185 */
+/* Slot 184 */
 void
 Tk_UpdatePointer(tkwin, x, y, state)
     Tk_Window tkwin;
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 455b528..f96e0e1 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.4.4.2 1999/03/06 23:07:52 stanton Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.4.4.3 1999/03/07 00:15:46 redman Exp $
  */
 
 #include "tkPort.h"
@@ -2835,7 +2835,7 @@ Initialize(interp)
      * Provide Tk and its stub table.
      */
 
-    code = Tcl_PkgProvide(interp, "Tk", TK_VERSION, (ClientData) tkStubsPtr);
+    code = Tcl_PkgProvideEx(interp, "Tk", TK_VERSION, (ClientData) tkStubsPtr);
     if (code != TCL_OK) {
 	goto done;
     }
diff --git a/win/makefile.vc b/win/makefile.vc
index 55f4ae3..5196f42 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -4,7 +4,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
 # Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# RCS: @(#) $Id: makefile.vc,v 1.19.2.1 1999/03/06 00:07:07 redman Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.19.2.2 1999/03/07 00:15:47 redman Exp $
 
 # Does not depend on the presence of any environment variables in
 # order to compile tcl; all needed information is derived from 
@@ -30,7 +30,6 @@ TOOLS32		= c:\program files\devstudio\vc
 TOOLS32_rc	= c:\program files\devstudio\sharedide
 TCLDIR		= ..\..\tcl8.0.5
 INSTALLDIR	= c:\program files\tcl
-TCLBINDIR       = d:\tcl8.0\bin
 
 # Set this to the appropriate value of /MACHINE: for your platform
 MACHINE	= IX86
@@ -67,7 +66,7 @@ OUTDIR		= $(TMPDIR)
 
 TCLLIB 		= $(TCLNAMEPREFIX)$(VERSION)$(DBGX).lib
 TCLPLUGINLIB 	= $(TCLNAMEPREFIX)$(VERSION)p.lib
-TCLSTUBLIBNAME  = $(TCLSTUBPREFIX)$(VERSION)$(DBGX).lib
+TCLSTUBLIB	= $(TCLSTUBPREFIX)$(VERSION)$(DBGX).lib
 TKDLLNAME	= $(TKNAMEPREFIX)$(VERSION)$(DBGX).dll
 TKDLL 		= $(OUTDIR)\$(TKDLLNAME)
 TKLIB		= $(OUTDIR)\$(TKNAMEPREFIX)$(VERSION)$(DBGX).lib
@@ -195,18 +194,20 @@ TKOBJS = \
 	$(TMPDIR)\tkTrig.obj \
 	$(TMPDIR)\tkUtil.obj \
 	$(TMPDIR)\tkVisual.obj \
+	$(TMPDIR)\tkStubInit.obj \
 	$(TMPDIR)\tkWindow.obj
 
 TKSTUBOBJS = \
-	$(TMDIR)\tkStubLib.obj \
+	$(TMPDIR)\tkStubLib.obj \
 	$(TMPDIR)\tkStubs.obj \
 	$(TMPDIR)\tkPlatStubs.obj \
 	$(TMPDIR)\tkIntStubs.obj \
 	$(TMPDIR)\tkIntPlatStubs.obj
 
-cc32		= @"$(TOOLS32)\bin\cl.exe"
-link32		= @"$(TOOLS32)\bin\link.exe"
-rc32		= @"$(TOOLS32_rc)\bin\rc.exe"
+cc32		= "$(TOOLS32)\bin\cl.exe"
+link32		= "$(TOOLS32)\bin\link.exe"
+lib32		= "$(TOOLS32)\bin\lib.exe"
+rc32		= "$(TOOLS32_rc)\bin\rc.exe"
 include32	= -I"$(TOOLS32)\include"
 
 WINDIR          = $(ROOT)\win
@@ -218,10 +219,13 @@ RCDIR		= $(WINDIR)\rc
 
 TK_INCLUDES	= -I$(WINDIR) -I$(GENERICDIR) -I$(BITMAPDIR) -I$(XLIBDIR) \
 			-I$(TCLDIR)\generic
-TK_DEFINES	= $(DEBUGDEFINES) -DUSE_TCL_STUBS
+TK_DEFINES	= $(DEBUGDEFINES)
 
 TK_CFLAGS	= $(cdebug) $(cflags) $(cvarsdll) $(include32) \
-			$(TK_INCLUDES) $(TK_DEFINES) 
+			$(TK_INCLUDES) $(TK_DEFINES)
+
+WISH_CFLAGS	= $(cdebug) $(cflags) $(cvarsdll) $(include32) \
+			$(TK_INCLUDES) $(TK_DEFINES)
 
 ######################################################################
 # Link flags
@@ -335,7 +339,8 @@ install-binaries:
 #
 
 stubs:
-	$(TCLBINDIR)\tclsh$(VERSION) $(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
+	$(TCLDIR)\win\$(TMPDIRNAME)\tclsh$(VERSION)$(DBGX) \
+		$(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
 		$(GENERICDIR)\tk.decls $(GENERICDIR)\tkInt.decls
 
 install-libraries:
@@ -363,7 +368,7 @@ $(TKDLL): $(TKOBJS) $(TMPDIR)\tk.res $(TMPDIR)\tk.def
 <<
 
 $(TKSTUBLIB): $(TKSTUBOBJS)
-	$lib32) /out:$@ $(TKSTUBOBJS)
+	$(lib32) /out:$@ $(TKSTUBOBJS)
 
 $(TKPLUGINLIB): $(TKPLUGINDLL)
 
@@ -375,7 +380,7 @@ $(TKPLUGINDLL): $(TKOBJS) $(TMPDIR)\tk.res $(TMPDIR)\plugin.def
 			$(TKOBJS)
 <<
 
-$(WISH): $(WISHOBJS) $(TKLIB) $(TMPDIR)\wish.res
+$(WISH): $(WISHOBJS) $(TKSTUBLIB) $(TKLIB) $(TMPDIR)\wish.res
 	set LIB=$(TOOLS32)\lib
 	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -stack:2300000 \
 		-out:$@ \
@@ -388,7 +393,7 @@ $(WISHP): $(WISHOBJS) $(TKPLUGINLIB) $(TMPDIR)\wish.res
 		$(guilibsdll) $(TCLLIBDIR)\$(TCLPLUGINLIB) \
 		$(TKPLUGINLIB) $(WISHOBJS) 
 
-$(TKTEST): $(TKTESTOBJS) $(TKLIB) $(TMPDIR)\wish.res
+$(TKTEST): $(TKTESTOBJS) $(TKSTUBLIB) $(TMPDIR)\wish.res
 	set LIB=$(TOOLS32)\lib
 	$(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -stack:2300000 \
 		-out:$@ \
@@ -424,7 +429,7 @@ $(TMPDIR)\tkSquare.obj: $(ROOT)\generic\tkSquare.c
 	$(cc32) $(TK_CFLAGS) -Fo$@ $?
 
 $(TMPDIR)\winMain.obj: $(ROOT)\win\winMain.c
-	$(cc32) $(TK_CFLAGS) -Fo$@ $?
+	$(cc32) $(WISH_CFLAGS) -Fo$@ $?
 
 #
 # Implicit rules
diff --git a/win/winMain.c b/win/winMain.c
index d55f447..6047d7b 100644
--- a/win/winMain.c
+++ b/win/winMain.c
@@ -8,10 +8,11 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: winMain.c,v 1.4.4.1 1999/03/06 23:18:05 stanton Exp $
+ * RCS: @(#) $Id: winMain.c,v 1.4.4.2 1999/03/07 00:15:47 redman Exp $
  */
 
 #include <tk.h>
+#include "tkInt.h"
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #undef WIN32_LEAN_AND_MEAN
@@ -23,8 +24,6 @@
  * interfaces are available for use, but are not supported.
  */
 
-EXTERN int		TkConsoleInit(Tcl_Interp *interp);
-
 /*
  * Forward declarations for procedures defined later in this file:
  */
@@ -133,6 +132,7 @@ Tcl_AppInit(interp)
     if (Tk_Init(interp) == TCL_ERROR) {
 	goto error;
     }
+
     Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit);
 
     /*