merged 8.1.0 changes into mainline

FossilOrigin-Name: 14df4a4ce7dcced8c16e47590d9569f9a94a0e38

1 files changed, 293 insertions, 400 deletions

diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index a767f68..7a1c1be 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.3 1999/04/16 01:51:16 stanton Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.4 1999/04/24 01:50:49 stanton Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -57,295 +57,256 @@ EXTERN void		TkUnixSetMenubar _ANSI_ARGS_((Tk_Window tkwin,
 /* 0 */
 EXTERN char *		TkAlignImageData _ANSI_ARGS_((XImage * image, 
 				int alignment, int bitOrder));
-/* 1 */
-EXTERN void		TkClipBox _ANSI_ARGS_((TkRegion rgn, 
-				XRectangle* rect_return));
+/* Slot 1 is reserved */
 /* 2 */
-EXTERN TkRegion		TkCreateRegion _ANSI_ARGS_((void));
-/* 3 */
-EXTERN void		TkDestroyRegion _ANSI_ARGS_((TkRegion rgn));
-/* 4 */
 EXTERN void		TkGenerateActivateEvents _ANSI_ARGS_((
 				TkWindow * winPtr, int active));
-/* 5 */
-EXTERN void		TkIntersectRegion _ANSI_ARGS_((TkRegion sra, 
-				TkRegion srcb, TkRegion dr_return));
-/* 6 */
+/* 3 */
 EXTERN unsigned long	TkpGetMS _ANSI_ARGS_((void));
-/* 7 */
+/* 4 */
 EXTERN void		TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr));
-/* 8 */
+/* 5 */
 EXTERN void		TkpPrintWindowId _ANSI_ARGS_((char * buf, 
 				Window window));
-/* 9 */
+/* 6 */
 EXTERN int		TkpScanWindowId _ANSI_ARGS_((Tcl_Interp * interp, 
 				char * string, int * idPtr));
-/* 10 */
+/* 7 */
 EXTERN void		TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr));
-/* 11 */
+/* 8 */
 EXTERN void		TkpSetCursor _ANSI_ARGS_((TkpCursor cursor));
-/* 12 */
+/* 9 */
 EXTERN void		TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, 
 				int state));
-/* 13 */
-EXTERN int		TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, 
-				int y, unsigned int width, 
-				unsigned int height));
-/* 14 */
+/* 10 */
 EXTERN void		TkSetPixmapColormap _ANSI_ARGS_((Pixmap pixmap, 
 				Colormap colormap));
-/* 15 */
-EXTERN void		TkSetRegion _ANSI_ARGS_((Display* display, GC gc, 
-				TkRegion rgn));
-/* 16 */
-EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, 
-				TkRegion src, TkRegion dr_return));
-/* 17 */
+/* 11 */
 EXTERN void		TkWinCancelMouseTimer _ANSI_ARGS_((void));
-/* 18 */
+/* 12 */
 EXTERN void		TkWinClipboardRender _ANSI_ARGS_((
 				TkDisplay * dispPtr, UINT format));
-/* 19 */
+/* 13 */
 EXTERN LRESULT		TkWinEmbeddedEventProc _ANSI_ARGS_((HWND hwnd, 
 				UINT message, WPARAM wParam, LPARAM lParam));
-/* 20 */
+/* 14 */
 EXTERN void		TkWinFillRect _ANSI_ARGS_((HDC dc, int x, int y, 
 				int width, int height, int pixel));
-/* 21 */
+/* 15 */
 EXTERN COLORREF		TkWinGetBorderPixels _ANSI_ARGS_((Tk_Window tkwin, 
 				Tk_3DBorder border, int which));
-/* 22 */
+/* 16 */
 EXTERN HDC		TkWinGetDrawableDC _ANSI_ARGS_((Display * display, 
 				Drawable d, TkWinDCState* state));
-/* 23 */
+/* 17 */
 EXTERN int		TkWinGetModifierState _ANSI_ARGS_((void));
-/* 24 */
+/* 18 */
 EXTERN HPALETTE		TkWinGetSystemPalette _ANSI_ARGS_((void));
-/* 25 */
+/* 19 */
 EXTERN HWND		TkWinGetWrapperWindow _ANSI_ARGS_((Tk_Window tkwin));
-/* 26 */
+/* 20 */
 EXTERN int		TkWinHandleMenuEvent _ANSI_ARGS_((HWND * phwnd, 
 				UINT * pMessage, WPARAM * pwParam, 
 				LPARAM * plParam, LRESULT * plResult));
-/* 27 */
+/* 21 */
 EXTERN int		TkWinIndexOfColor _ANSI_ARGS_((XColor * colorPtr));
-/* 28 */
+/* 22 */
 EXTERN void		TkWinReleaseDrawableDC _ANSI_ARGS_((Drawable d, 
 				HDC hdc, TkWinDCState* state));
-/* 29 */
+/* 23 */
 EXTERN LRESULT		TkWinResendEvent _ANSI_ARGS_((WNDPROC wndproc, 
 				HWND hwnd, XEvent * eventPtr));
-/* 30 */
+/* 24 */
 EXTERN HPALETTE		TkWinSelectPalette _ANSI_ARGS_((HDC dc, 
 				Colormap colormap));
-/* 31 */
+/* 25 */
 EXTERN void		TkWinSetMenu _ANSI_ARGS_((Tk_Window tkwin, 
 				HMENU hMenu));
-/* 32 */
+/* 26 */
 EXTERN void		TkWinSetWindowPos _ANSI_ARGS_((HWND hwnd, 
 				HWND siblingHwnd, int pos));
-/* 33 */
+/* 27 */
 EXTERN void		TkWinWmCleanup _ANSI_ARGS_((HINSTANCE hInstance));
-/* 34 */
+/* 28 */
 EXTERN void		TkWinXCleanup _ANSI_ARGS_((HINSTANCE hInstance));
-/* 35 */
+/* 29 */
 EXTERN void		TkWinXInit _ANSI_ARGS_((HINSTANCE hInstance));
-/* 36 */
+/* 30 */
 EXTERN void		TkWinSetForegroundWindow _ANSI_ARGS_((
 				TkWindow * winPtr));
-/* 37 */
+/* 31 */
 EXTERN void		TkWinDialogDebug _ANSI_ARGS_((int debug));
-/* 38 */
+/* 32 */
 EXTERN Tcl_Obj *	TkWinGetMenuSystemDefault _ANSI_ARGS_((
 				Tk_Window tkwin, char * dbName, 
 				char * className));
-/* 39 */
+/* 33 */
 EXTERN int		TkWinGetPlatformId _ANSI_ARGS_((void));
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
 /* 0 */
-EXTERN void		TkClipBox _ANSI_ARGS_((TkRegion rgn, 
-				XRectangle* rect_return));
-/* 1 */
-EXTERN TkRegion		TkCreateRegion _ANSI_ARGS_((void));
-/* 2 */
-EXTERN void		TkDestroyRegion _ANSI_ARGS_((TkRegion rgn));
-/* 3 */
 EXTERN void		TkGenerateActivateEvents _ANSI_ARGS_((
 				TkWindow * winPtr, int active));
-/* 4 */
-EXTERN void		TkIntersectRegion _ANSI_ARGS_((TkRegion sra, 
-				TkRegion srcb, TkRegion dr_return));
-/* 5 */
+/* 1 */
 EXTERN Pixmap		TkpCreateNativeBitmap _ANSI_ARGS_((Display * display, 
 				char * source));
-/* 6 */
+/* 2 */
 EXTERN void		TkpDefineNativeBitmaps _ANSI_ARGS_((void));
-/* 7 */
+/* 3 */
 EXTERN unsigned long	TkpGetMS _ANSI_ARGS_((void));
-/* 8 */
+/* 4 */
 EXTERN Pixmap		TkpGetNativeAppBitmap _ANSI_ARGS_((Display * display, 
 				char * name, int * width, int * height));
-/* 9 */
+/* 5 */
 EXTERN void		TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr));
-/* 10 */
+/* 6 */
 EXTERN void		TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr));
-/* 11 */
+/* 7 */
 EXTERN void		TkpSetCursor _ANSI_ARGS_((TkpCursor cursor));
-/* 12 */
+/* 8 */
 EXTERN void		TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, 
 				int state));
-/* 13 */
-EXTERN int		TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, 
-				int y, unsigned int width, 
-				unsigned int height));
-/* 14 */
-EXTERN void		TkSetRegion _ANSI_ARGS_((Display* display, GC gc, 
-				TkRegion rgn));
-/* 15 */
-EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, 
-				TkRegion src, TkRegion dr_return));
-/* 16 */
+/* 9 */
 EXTERN int		HandleWMEvent _ANSI_ARGS_((EventRecord * theEvent));
-/* 17 */
+/* 10 */
 EXTERN void		TkAboutDlg _ANSI_ARGS_((void));
-/* 18 */
+/* 11 */
 EXTERN void		TkCreateMacEventSource _ANSI_ARGS_((void));
-/* 19 */
+/* 12 */
 EXTERN void		TkFontList _ANSI_ARGS_((Tcl_Interp * interp, 
 				Display * display));
-/* 20 */
+/* 13 */
 EXTERN Window		TkGetTransientMaster _ANSI_ARGS_((TkWindow * winPtr));
-/* 21 */
+/* 14 */
 EXTERN int		TkGenerateButtonEvent _ANSI_ARGS_((int x, int y, 
 				Window window, unsigned int state));
-/* 22 */
+/* 15 */
 EXTERN int		TkGetCharPositions _ANSI_ARGS_((
 				XFontStruct * font_struct, char * string, 
 				int count, short * buffer));
-/* 23 */
+/* 16 */
 EXTERN void		TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin));
-/* 24 */
+/* 17 */
 EXTERN void		TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin, 
 				int x, int y, int width, int height, 
 				int flags));
-/* 25 */
+/* 18 */
 EXTERN unsigned int	TkMacButtonKeyState _ANSI_ARGS_((void));
-/* 26 */
+/* 19 */
 EXTERN void		TkMacClearMenubarActive _ANSI_ARGS_((void));
-/* 27 */
+/* 20 */
 EXTERN int		TkMacConvertEvent _ANSI_ARGS_((
 				EventRecord * eventPtr));
-/* 28 */
+/* 21 */
 EXTERN int		TkMacDispatchMenuEvent _ANSI_ARGS_((int menuID, 
 				int index));
-/* 29 */
+/* 22 */
 EXTERN void		TkMacInstallCursor _ANSI_ARGS_((int resizeOverride));
-/* 30 */
+/* 23 */
 EXTERN int		TkMacConvertTkEvent _ANSI_ARGS_((
 				EventRecord * eventPtr, Window window));
-/* 31 */
+/* 24 */
 EXTERN void		TkMacHandleTearoffMenu _ANSI_ARGS_((void));
-/* 32 */
+/* 25 */
 EXTERN void		tkMacInstallMWConsole _ANSI_ARGS_((
 				Tcl_Interp * interp));
-/* 33 */
+/* 26 */
 EXTERN void		TkMacInvalClipRgns _ANSI_ARGS_((TkWindow * winPtr));
-/* 34 */
+/* 27 */
 EXTERN void		TkMacDoHLEvent _ANSI_ARGS_((EventRecord * theEvent));
-/* 35 */
+/* 28 */
 EXTERN void		TkMacFontInfo _ANSI_ARGS_((Font fontId, 
 				short * family, short * style, short * size));
-/* 36 */
+/* 29 */
 EXTERN Time		TkMacGenerateTime _ANSI_ARGS_((void));
-/* 37 */
+/* 30 */
 EXTERN GWorldPtr	TkMacGetDrawablePort _ANSI_ARGS_((Drawable drawable));
-/* 38 */
+/* 31 */
 EXTERN TkWindow *	TkMacGetScrollbarGrowWindow _ANSI_ARGS_((
 				TkWindow * winPtr));
-/* 39 */
+/* 32 */
 EXTERN Window		TkMacGetXWindow _ANSI_ARGS_((WindowRef macWinPtr));
-/* 40 */
+/* 33 */
 EXTERN int		TkMacGrowToplevel _ANSI_ARGS_((WindowRef whichWindow, 
 				Point start));
-/* 41 */
+/* 34 */
 EXTERN void		TkMacHandleMenuSelect _ANSI_ARGS_((long mResult, 
 				int optionKeyPressed));
-/* 42 */
+/* 35 */
 EXTERN int		TkMacHaveAppearance _ANSI_ARGS_((void));
-/* 43 */
+/* 36 */
 EXTERN void		TkMacInitAppleEvents _ANSI_ARGS_((
 				Tcl_Interp * interp));
-/* 44 */
+/* 37 */
 EXTERN void		TkMacInitMenus _ANSI_ARGS_((Tcl_Interp * interp));
-/* 45 */
+/* 38 */
 EXTERN void		TkMacInvalidateWindow _ANSI_ARGS_((
 				MacDrawable * macWin, int flag));
-/* 46 */
+/* 39 */
 EXTERN int		TkMacIsCharacterMissing _ANSI_ARGS_((Tk_Font tkfont, 
 				unsigned int searchChar));
-/* 47 */
+/* 40 */
 EXTERN void		TkMacMakeRealWindowExist _ANSI_ARGS_((
 				TkWindow * winPtr));
-/* 48 */
+/* 41 */
 EXTERN BitMapPtr	TkMacMakeStippleMap _ANSI_ARGS_((Drawable d1, 
 				Drawable d2));
-/* 49 */
+/* 42 */
 EXTERN void		TkMacMenuClick _ANSI_ARGS_((void));
-/* 50 */
+/* 43 */
 EXTERN void		TkMacRegisterOffScreenWindow _ANSI_ARGS_((
 				Window window, GWorldPtr portPtr));
-/* 51 */
+/* 44 */
 EXTERN int		TkMacResizable _ANSI_ARGS_((TkWindow * winPtr));
-/* 52 */
+/* 45 */
 EXTERN void		TkMacSetEmbedRgn _ANSI_ARGS_((TkWindow * winPtr, 
 				RgnHandle rgn));
-/* 53 */
+/* 46 */
 EXTERN void		TkMacSetHelpMenuItemCount _ANSI_ARGS_((void));
-/* 54 */
+/* 47 */
 EXTERN void		TkMacSetScrollbarGrow _ANSI_ARGS_((TkWindow * winPtr, 
 				int flag));
-/* 55 */
+/* 48 */
 EXTERN void		TkMacSetUpClippingRgn _ANSI_ARGS_((Drawable drawable));
-/* 56 */
+/* 49 */
 EXTERN void		TkMacSetUpGraphicsPort _ANSI_ARGS_((GC gc));
-/* 57 */
+/* 50 */
 EXTERN void		TkMacUpdateClipRgn _ANSI_ARGS_((TkWindow * winPtr));
-/* 58 */
+/* 51 */
 EXTERN void		TkMacUnregisterMacWindow _ANSI_ARGS_((
 				GWorldPtr portPtr));
-/* 59 */
+/* 52 */
 EXTERN int		TkMacUseMenuID _ANSI_ARGS_((short macID));
-/* 60 */
+/* 53 */
 EXTERN RgnHandle	TkMacVisableClipRgn _ANSI_ARGS_((TkWindow * winPtr));
-/* 61 */
+/* 54 */
 EXTERN void		TkMacWinBounds _ANSI_ARGS_((TkWindow * winPtr, 
 				Rect * geometry));
-/* 62 */
+/* 55 */
 EXTERN void		TkMacWindowOffset _ANSI_ARGS_((WindowRef wRef, 
 				int * xOffset, int * yOffset));
-/* 63 */
+/* 56 */
 EXTERN void		TkResumeClipboard _ANSI_ARGS_((void));
-/* 64 */
+/* 57 */
 EXTERN int		TkSetMacColor _ANSI_ARGS_((unsigned long pixel, 
 				RGBColor * macColor));
-/* 65 */
+/* 58 */
 EXTERN void		TkSetWMName _ANSI_ARGS_((TkWindow * winPtr, 
 				Tk_Uid titleUid));
-/* 66 */
+/* 59 */
 EXTERN void		TkSuspendClipboard _ANSI_ARGS_((void));
-/* 67 */
+/* 60 */
 EXTERN int		TkWMGrowToplevel _ANSI_ARGS_((WindowRef whichWindow, 
 				Point start));
-/* 68 */
+/* 61 */
 EXTERN int		TkMacZoomToplevel _ANSI_ARGS_((WindowPtr whichWindow, 
 				Point where, short zoomPart));
-/* 69 */
+/* 62 */
 EXTERN Tk_Window	Tk_TopCoordsToWindow _ANSI_ARGS_((Tk_Window tkwin, 
 				int rootX, int rootY, int * newX, int * newY));
-/* 70 */
+/* 63 */
 EXTERN MacDrawable *	TkMacContainerId _ANSI_ARGS_((TkWindow * winPtr));
-/* 71 */
+/* 64 */
 EXTERN MacDrawable *	TkMacGetHostToplevel _ANSI_ARGS_((TkWindow * winPtr));
 #endif /* MAC_TCL */
 
@@ -365,119 +326,106 @@ typedef struct TkIntPlatStubs {
 #endif /* UNIX */
 #ifdef __WIN32__
     char * (*tkAlignImageData) _ANSI_ARGS_((XImage * image, int alignment, int bitOrder)); /* 0 */
-    void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 1 */
-    TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 2 */
-    void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 3 */
-    void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 4 */
-    void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 5 */
-    unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 6 */
-    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 (*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 */
-    void (*tkWinSetForegroundWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 36 */
-    void (*tkWinDialogDebug) _ANSI_ARGS_((int debug)); /* 37 */
-    Tcl_Obj * (*tkWinGetMenuSystemDefault) _ANSI_ARGS_((Tk_Window tkwin, char * dbName, char * className)); /* 38 */
-    int (*tkWinGetPlatformId) _ANSI_ARGS_((void)); /* 39 */
+    void *reserved1;
+    void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 2 */
+    unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 3 */
+    void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 4 */
+    void (*tkpPrintWindowId) _ANSI_ARGS_((char * buf, Window window)); /* 5 */
+    int (*tkpScanWindowId) _ANSI_ARGS_((Tcl_Interp * interp, char * string, int * idPtr)); /* 6 */
+    void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 7 */
+    void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 8 */
+    void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 9 */
+    void (*tkSetPixmapColormap) _ANSI_ARGS_((Pixmap pixmap, Colormap colormap)); /* 10 */
+    void (*tkWinCancelMouseTimer) _ANSI_ARGS_((void)); /* 11 */
+    void (*tkWinClipboardRender) _ANSI_ARGS_((TkDisplay * dispPtr, UINT format)); /* 12 */
+    LRESULT (*tkWinEmbeddedEventProc) _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)); /* 13 */
+    void (*tkWinFillRect) _ANSI_ARGS_((HDC dc, int x, int y, int width, int height, int pixel)); /* 14 */
+    COLORREF (*tkWinGetBorderPixels) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int which)); /* 15 */
+    HDC (*tkWinGetDrawableDC) _ANSI_ARGS_((Display * display, Drawable d, TkWinDCState* state)); /* 16 */
+    int (*tkWinGetModifierState) _ANSI_ARGS_((void)); /* 17 */
+    HPALETTE (*tkWinGetSystemPalette) _ANSI_ARGS_((void)); /* 18 */
+    HWND (*tkWinGetWrapperWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 19 */
+    int (*tkWinHandleMenuEvent) _ANSI_ARGS_((HWND * phwnd, UINT * pMessage, WPARAM * pwParam, LPARAM * plParam, LRESULT * plResult)); /* 20 */
+    int (*tkWinIndexOfColor) _ANSI_ARGS_((XColor * colorPtr)); /* 21 */
+    void (*tkWinReleaseDrawableDC) _ANSI_ARGS_((Drawable d, HDC hdc, TkWinDCState* state)); /* 22 */
+    LRESULT (*tkWinResendEvent) _ANSI_ARGS_((WNDPROC wndproc, HWND hwnd, XEvent * eventPtr)); /* 23 */
+    HPALETTE (*tkWinSelectPalette) _ANSI_ARGS_((HDC dc, Colormap colormap)); /* 24 */
+    void (*tkWinSetMenu) _ANSI_ARGS_((Tk_Window tkwin, HMENU hMenu)); /* 25 */
+    void (*tkWinSetWindowPos) _ANSI_ARGS_((HWND hwnd, HWND siblingHwnd, int pos)); /* 26 */
+    void (*tkWinWmCleanup) _ANSI_ARGS_((HINSTANCE hInstance)); /* 27 */
+    void (*tkWinXCleanup) _ANSI_ARGS_((HINSTANCE hInstance)); /* 28 */
+    void (*tkWinXInit) _ANSI_ARGS_((HINSTANCE hInstance)); /* 29 */
+    void (*tkWinSetForegroundWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 30 */
+    void (*tkWinDialogDebug) _ANSI_ARGS_((int debug)); /* 31 */
+    Tcl_Obj * (*tkWinGetMenuSystemDefault) _ANSI_ARGS_((Tk_Window tkwin, char * dbName, char * className)); /* 32 */
+    int (*tkWinGetPlatformId) _ANSI_ARGS_((void)); /* 33 */
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
-    void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 0 */
-    TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 1 */
-    void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 2 */
-    void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 3 */
-    void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 4 */
-    Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display * display, char * source)); /* 5 */
-    void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 6 */
-    unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 7 */
-    Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display * display, char * name, int * width, int * height)); /* 8 */
-    void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 9 */
-    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 (*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 */
+    void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 0 */
+    Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display * display, char * source)); /* 1 */
+    void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 2 */
+    unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 3 */
+    Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display * display, char * name, int * width, int * height)); /* 4 */
+    void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 5 */
+    void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 6 */
+    void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 7 */
+    void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 8 */
+    int (*handleWMEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 9 */
+    void (*tkAboutDlg) _ANSI_ARGS_((void)); /* 10 */
+    void (*tkCreateMacEventSource) _ANSI_ARGS_((void)); /* 11 */
+    void (*tkFontList) _ANSI_ARGS_((Tcl_Interp * interp, Display * display)); /* 12 */
+    Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow * winPtr)); /* 13 */
+    int (*tkGenerateButtonEvent) _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* 14 */
+    int (*tkGetCharPositions) _ANSI_ARGS_((XFontStruct * font_struct, char * string, int count, short * buffer)); /* 15 */
+    void (*tkGenWMDestroyEvent) _ANSI_ARGS_((Tk_Window tkwin)); /* 16 */
+    void (*tkGenWMConfigureEvent) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 17 */
+    unsigned int (*tkMacButtonKeyState) _ANSI_ARGS_((void)); /* 18 */
+    void (*tkMacClearMenubarActive) _ANSI_ARGS_((void)); /* 19 */
+    int (*tkMacConvertEvent) _ANSI_ARGS_((EventRecord * eventPtr)); /* 20 */
+    int (*tkMacDispatchMenuEvent) _ANSI_ARGS_((int menuID, int index)); /* 21 */
+    void (*tkMacInstallCursor) _ANSI_ARGS_((int resizeOverride)); /* 22 */
+    int (*tkMacConvertTkEvent) _ANSI_ARGS_((EventRecord * eventPtr, Window window)); /* 23 */
+    void (*tkMacHandleTearoffMenu) _ANSI_ARGS_((void)); /* 24 */
+    void (*tkMacInstallMWConsole) _ANSI_ARGS_((Tcl_Interp * interp)); /* 25 */
+    void (*tkMacInvalClipRgns) _ANSI_ARGS_((TkWindow * winPtr)); /* 26 */
+    void (*tkMacDoHLEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 27 */
+    void (*tkMacFontInfo) _ANSI_ARGS_((Font fontId, short * family, short * style, short * size)); /* 28 */
+    Time (*tkMacGenerateTime) _ANSI_ARGS_((void)); /* 29 */
+    GWorldPtr (*tkMacGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 30 */
+    TkWindow * (*tkMacGetScrollbarGrowWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 31 */
+    Window (*tkMacGetXWindow) _ANSI_ARGS_((WindowRef macWinPtr)); /* 32 */
+    int (*tkMacGrowToplevel) _ANSI_ARGS_((WindowRef whichWindow, Point start)); /* 33 */
+    void (*tkMacHandleMenuSelect) _ANSI_ARGS_((long mResult, int optionKeyPressed)); /* 34 */
+    int (*tkMacHaveAppearance) _ANSI_ARGS_((void)); /* 35 */
+    void (*tkMacInitAppleEvents) _ANSI_ARGS_((Tcl_Interp * interp)); /* 36 */
+    void (*tkMacInitMenus) _ANSI_ARGS_((Tcl_Interp * interp)); /* 37 */
+    void (*tkMacInvalidateWindow) _ANSI_ARGS_((MacDrawable * macWin, int flag)); /* 38 */
+    int (*tkMacIsCharacterMissing) _ANSI_ARGS_((Tk_Font tkfont, unsigned int searchChar)); /* 39 */
+    void (*tkMacMakeRealWindowExist) _ANSI_ARGS_((TkWindow * winPtr)); /* 40 */
+    BitMapPtr (*tkMacMakeStippleMap) _ANSI_ARGS_((Drawable d1, Drawable d2)); /* 41 */
+    void (*tkMacMenuClick) _ANSI_ARGS_((void)); /* 42 */
+    void (*tkMacRegisterOffScreenWindow) _ANSI_ARGS_((Window window, GWorldPtr portPtr)); /* 43 */
+    int (*tkMacResizable) _ANSI_ARGS_((TkWindow * winPtr)); /* 44 */
+    void (*tkMacSetEmbedRgn) _ANSI_ARGS_((TkWindow * winPtr, RgnHandle rgn)); /* 45 */
+    void (*tkMacSetHelpMenuItemCount) _ANSI_ARGS_((void)); /* 46 */
+    void (*tkMacSetScrollbarGrow) _ANSI_ARGS_((TkWindow * winPtr, int flag)); /* 47 */
+    void (*tkMacSetUpClippingRgn) _ANSI_ARGS_((Drawable drawable)); /* 48 */
+    void (*tkMacSetUpGraphicsPort) _ANSI_ARGS_((GC gc)); /* 49 */
+    void (*tkMacUpdateClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 50 */
+    void (*tkMacUnregisterMacWindow) _ANSI_ARGS_((GWorldPtr portPtr)); /* 51 */
+    int (*tkMacUseMenuID) _ANSI_ARGS_((short macID)); /* 52 */
+    RgnHandle (*tkMacVisableClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 53 */
+    void (*tkMacWinBounds) _ANSI_ARGS_((TkWindow * winPtr, Rect * geometry)); /* 54 */
+    void (*tkMacWindowOffset) _ANSI_ARGS_((WindowRef wRef, int * xOffset, int * yOffset)); /* 55 */
+    void (*tkResumeClipboard) _ANSI_ARGS_((void)); /* 56 */
+    int (*tkSetMacColor) _ANSI_ARGS_((unsigned long pixel, RGBColor * macColor)); /* 57 */
+    void (*tkSetWMName) _ANSI_ARGS_((TkWindow * winPtr, Tk_Uid titleUid)); /* 58 */
+    void (*tkSuspendClipboard) _ANSI_ARGS_((void)); /* 59 */
+    int (*tkWMGrowToplevel) _ANSI_ARGS_((WindowRef whichWindow, Point start)); /* 60 */
+    int (*tkMacZoomToplevel) _ANSI_ARGS_((WindowPtr whichWindow, Point where, short zoomPart)); /* 61 */
+    Tk_Window (*tk_TopCoordsToWindow) _ANSI_ARGS_((Tk_Window tkwin, int rootX, int rootY, int * newX, int * newY)); /* 62 */
+    MacDrawable * (*tkMacContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 63 */
+    MacDrawable * (*tkMacGetHostToplevel) _ANSI_ARGS_((TkWindow * winPtr)); /* 64 */
 #endif /* MAC_TCL */
 } TkIntPlatStubs;
 
@@ -528,451 +476,396 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkAlignImageData \
 	(tkIntPlatStubsPtr->tkAlignImageData) /* 0 */
 #endif
-#ifndef TkClipBox
-#define TkClipBox \
-	(tkIntPlatStubsPtr->tkClipBox) /* 1 */
-#endif
-#ifndef TkCreateRegion
-#define TkCreateRegion \
-	(tkIntPlatStubsPtr->tkCreateRegion) /* 2 */
-#endif
-#ifndef TkDestroyRegion
-#define TkDestroyRegion \
-	(tkIntPlatStubsPtr->tkDestroyRegion) /* 3 */
-#endif
+/* Slot 1 is reserved */
 #ifndef TkGenerateActivateEvents
 #define TkGenerateActivateEvents \
-	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 4 */
-#endif
-#ifndef TkIntersectRegion
-#define TkIntersectRegion \
-	(tkIntPlatStubsPtr->tkIntersectRegion) /* 5 */
+	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 2 */
 #endif
 #ifndef TkpGetMS
 #define TkpGetMS \
-	(tkIntPlatStubsPtr->tkpGetMS) /* 6 */
+	(tkIntPlatStubsPtr->tkpGetMS) /* 3 */
 #endif
 #ifndef TkPointerDeadWindow
 #define TkPointerDeadWindow \
-	(tkIntPlatStubsPtr->tkPointerDeadWindow) /* 7 */
+	(tkIntPlatStubsPtr->tkPointerDeadWindow) /* 4 */
 #endif
 #ifndef TkpPrintWindowId
 #define TkpPrintWindowId \
-	(tkIntPlatStubsPtr->tkpPrintWindowId) /* 8 */
+	(tkIntPlatStubsPtr->tkpPrintWindowId) /* 5 */
 #endif
 #ifndef TkpScanWindowId
 #define TkpScanWindowId \
-	(tkIntPlatStubsPtr->tkpScanWindowId) /* 9 */
+	(tkIntPlatStubsPtr->tkpScanWindowId) /* 6 */
 #endif
 #ifndef TkpSetCapture
 #define TkpSetCapture \
-	(tkIntPlatStubsPtr->tkpSetCapture) /* 10 */
+	(tkIntPlatStubsPtr->tkpSetCapture) /* 7 */
 #endif
 #ifndef TkpSetCursor
 #define TkpSetCursor \
-	(tkIntPlatStubsPtr->tkpSetCursor) /* 11 */
+	(tkIntPlatStubsPtr->tkpSetCursor) /* 8 */
 #endif
 #ifndef TkpWmSetState
 #define TkpWmSetState \
-	(tkIntPlatStubsPtr->tkpWmSetState) /* 12 */
-#endif
-#ifndef TkRectInRegion
-#define TkRectInRegion \
-	(tkIntPlatStubsPtr->tkRectInRegion) /* 13 */
+	(tkIntPlatStubsPtr->tkpWmSetState) /* 9 */
 #endif
 #ifndef TkSetPixmapColormap
 #define TkSetPixmapColormap \
-	(tkIntPlatStubsPtr->tkSetPixmapColormap) /* 14 */
-#endif
-#ifndef TkSetRegion
-#define TkSetRegion \
-	(tkIntPlatStubsPtr->tkSetRegion) /* 15 */
-#endif
-#ifndef TkUnionRectWithRegion
-#define TkUnionRectWithRegion \
-	(tkIntPlatStubsPtr->tkUnionRectWithRegion) /* 16 */
+	(tkIntPlatStubsPtr->tkSetPixmapColormap) /* 10 */
 #endif
 #ifndef TkWinCancelMouseTimer
 #define TkWinCancelMouseTimer \
-	(tkIntPlatStubsPtr->tkWinCancelMouseTimer) /* 17 */
+	(tkIntPlatStubsPtr->tkWinCancelMouseTimer) /* 11 */
 #endif
 #ifndef TkWinClipboardRender
 #define TkWinClipboardRender \
-	(tkIntPlatStubsPtr->tkWinClipboardRender) /* 18 */
+	(tkIntPlatStubsPtr->tkWinClipboardRender) /* 12 */
 #endif
 #ifndef TkWinEmbeddedEventProc
 #define TkWinEmbeddedEventProc \
-	(tkIntPlatStubsPtr->tkWinEmbeddedEventProc) /* 19 */
+	(tkIntPlatStubsPtr->tkWinEmbeddedEventProc) /* 13 */
 #endif
 #ifndef TkWinFillRect
 #define TkWinFillRect \
-	(tkIntPlatStubsPtr->tkWinFillRect) /* 20 */
+	(tkIntPlatStubsPtr->tkWinFillRect) /* 14 */
 #endif
 #ifndef TkWinGetBorderPixels
 #define TkWinGetBorderPixels \
-	(tkIntPlatStubsPtr->tkWinGetBorderPixels) /* 21 */
+	(tkIntPlatStubsPtr->tkWinGetBorderPixels) /* 15 */
 #endif
 #ifndef TkWinGetDrawableDC
 #define TkWinGetDrawableDC \
-	(tkIntPlatStubsPtr->tkWinGetDrawableDC) /* 22 */
+	(tkIntPlatStubsPtr->tkWinGetDrawableDC) /* 16 */
 #endif
 #ifndef TkWinGetModifierState
 #define TkWinGetModifierState \
-	(tkIntPlatStubsPtr->tkWinGetModifierState) /* 23 */
+	(tkIntPlatStubsPtr->tkWinGetModifierState) /* 17 */
 #endif
 #ifndef TkWinGetSystemPalette
 #define TkWinGetSystemPalette \
-	(tkIntPlatStubsPtr->tkWinGetSystemPalette) /* 24 */
+	(tkIntPlatStubsPtr->tkWinGetSystemPalette) /* 18 */
 #endif
 #ifndef TkWinGetWrapperWindow
 #define TkWinGetWrapperWindow \
-	(tkIntPlatStubsPtr->tkWinGetWrapperWindow) /* 25 */
+	(tkIntPlatStubsPtr->tkWinGetWrapperWindow) /* 19 */
 #endif
 #ifndef TkWinHandleMenuEvent
 #define TkWinHandleMenuEvent \
-	(tkIntPlatStubsPtr->tkWinHandleMenuEvent) /* 26 */
+	(tkIntPlatStubsPtr->tkWinHandleMenuEvent) /* 20 */
 #endif
 #ifndef TkWinIndexOfColor
 #define TkWinIndexOfColor \
-	(tkIntPlatStubsPtr->tkWinIndexOfColor) /* 27 */
+	(tkIntPlatStubsPtr->tkWinIndexOfColor) /* 21 */
 #endif
 #ifndef TkWinReleaseDrawableDC
 #define TkWinReleaseDrawableDC \
-	(tkIntPlatStubsPtr->tkWinReleaseDrawableDC) /* 28 */
+	(tkIntPlatStubsPtr->tkWinReleaseDrawableDC) /* 22 */
 #endif
 #ifndef TkWinResendEvent
 #define TkWinResendEvent \
-	(tkIntPlatStubsPtr->tkWinResendEvent) /* 29 */
+	(tkIntPlatStubsPtr->tkWinResendEvent) /* 23 */
 #endif
 #ifndef TkWinSelectPalette
 #define TkWinSelectPalette \
-	(tkIntPlatStubsPtr->tkWinSelectPalette) /* 30 */
+	(tkIntPlatStubsPtr->tkWinSelectPalette) /* 24 */
 #endif
 #ifndef TkWinSetMenu
 #define TkWinSetMenu \
-	(tkIntPlatStubsPtr->tkWinSetMenu) /* 31 */
+	(tkIntPlatStubsPtr->tkWinSetMenu) /* 25 */
 #endif
 #ifndef TkWinSetWindowPos
 #define TkWinSetWindowPos \
-	(tkIntPlatStubsPtr->tkWinSetWindowPos) /* 32 */
+	(tkIntPlatStubsPtr->tkWinSetWindowPos) /* 26 */
 #endif
 #ifndef TkWinWmCleanup
 #define TkWinWmCleanup \
-	(tkIntPlatStubsPtr->tkWinWmCleanup) /* 33 */
+	(tkIntPlatStubsPtr->tkWinWmCleanup) /* 27 */
 #endif
 #ifndef TkWinXCleanup
 #define TkWinXCleanup \
-	(tkIntPlatStubsPtr->tkWinXCleanup) /* 34 */
+	(tkIntPlatStubsPtr->tkWinXCleanup) /* 28 */
 #endif
 #ifndef TkWinXInit
 #define TkWinXInit \
-	(tkIntPlatStubsPtr->tkWinXInit) /* 35 */
+	(tkIntPlatStubsPtr->tkWinXInit) /* 29 */
 #endif
 #ifndef TkWinSetForegroundWindow
 #define TkWinSetForegroundWindow \
-	(tkIntPlatStubsPtr->tkWinSetForegroundWindow) /* 36 */
+	(tkIntPlatStubsPtr->tkWinSetForegroundWindow) /* 30 */
 #endif
 #ifndef TkWinDialogDebug
 #define TkWinDialogDebug \
-	(tkIntPlatStubsPtr->tkWinDialogDebug) /* 37 */
+	(tkIntPlatStubsPtr->tkWinDialogDebug) /* 31 */
 #endif
 #ifndef TkWinGetMenuSystemDefault
 #define TkWinGetMenuSystemDefault \
-	(tkIntPlatStubsPtr->tkWinGetMenuSystemDefault) /* 38 */
+	(tkIntPlatStubsPtr->tkWinGetMenuSystemDefault) /* 32 */
 #endif
 #ifndef TkWinGetPlatformId
 #define TkWinGetPlatformId \
-	(tkIntPlatStubsPtr->tkWinGetPlatformId) /* 39 */
+	(tkIntPlatStubsPtr->tkWinGetPlatformId) /* 33 */
 #endif
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
-#ifndef TkClipBox
-#define TkClipBox \
-	(tkIntPlatStubsPtr->tkClipBox) /* 0 */
-#endif
-#ifndef TkCreateRegion
-#define TkCreateRegion \
-	(tkIntPlatStubsPtr->tkCreateRegion) /* 1 */
-#endif
-#ifndef TkDestroyRegion
-#define TkDestroyRegion \
-	(tkIntPlatStubsPtr->tkDestroyRegion) /* 2 */
-#endif
 #ifndef TkGenerateActivateEvents
 #define TkGenerateActivateEvents \
-	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 3 */
-#endif
-#ifndef TkIntersectRegion
-#define TkIntersectRegion \
-	(tkIntPlatStubsPtr->tkIntersectRegion) /* 4 */
+	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */
 #endif
 #ifndef TkpCreateNativeBitmap
 #define TkpCreateNativeBitmap \
-	(tkIntPlatStubsPtr->tkpCreateNativeBitmap) /* 5 */
+	(tkIntPlatStubsPtr->tkpCreateNativeBitmap) /* 1 */
 #endif
 #ifndef TkpDefineNativeBitmaps
 #define TkpDefineNativeBitmaps \
-	(tkIntPlatStubsPtr->tkpDefineNativeBitmaps) /* 6 */
+	(tkIntPlatStubsPtr->tkpDefineNativeBitmaps) /* 2 */
 #endif
 #ifndef TkpGetMS
 #define TkpGetMS \
-	(tkIntPlatStubsPtr->tkpGetMS) /* 7 */
+	(tkIntPlatStubsPtr->tkpGetMS) /* 3 */
 #endif
 #ifndef TkpGetNativeAppBitmap
 #define TkpGetNativeAppBitmap \
-	(tkIntPlatStubsPtr->tkpGetNativeAppBitmap) /* 8 */
+	(tkIntPlatStubsPtr->tkpGetNativeAppBitmap) /* 4 */
 #endif
 #ifndef TkPointerDeadWindow
 #define TkPointerDeadWindow \
-	(tkIntPlatStubsPtr->tkPointerDeadWindow) /* 9 */
+	(tkIntPlatStubsPtr->tkPointerDeadWindow) /* 5 */
 #endif
 #ifndef TkpSetCapture
 #define TkpSetCapture \
-	(tkIntPlatStubsPtr->tkpSetCapture) /* 10 */
+	(tkIntPlatStubsPtr->tkpSetCapture) /* 6 */
 #endif
 #ifndef TkpSetCursor
 #define TkpSetCursor \
-	(tkIntPlatStubsPtr->tkpSetCursor) /* 11 */
+	(tkIntPlatStubsPtr->tkpSetCursor) /* 7 */
 #endif
 #ifndef TkpWmSetState
 #define TkpWmSetState \
-	(tkIntPlatStubsPtr->tkpWmSetState) /* 12 */
-#endif
-#ifndef TkRectInRegion
-#define TkRectInRegion \
-	(tkIntPlatStubsPtr->tkRectInRegion) /* 13 */
-#endif
-#ifndef TkSetRegion
-#define TkSetRegion \
-	(tkIntPlatStubsPtr->tkSetRegion) /* 14 */
-#endif
-#ifndef TkUnionRectWithRegion
-#define TkUnionRectWithRegion \
-	(tkIntPlatStubsPtr->tkUnionRectWithRegion) /* 15 */
+	(tkIntPlatStubsPtr->tkpWmSetState) /* 8 */
 #endif
 #ifndef HandleWMEvent
 #define HandleWMEvent \
-	(tkIntPlatStubsPtr->handleWMEvent) /* 16 */
+	(tkIntPlatStubsPtr->handleWMEvent) /* 9 */
 #endif
 #ifndef TkAboutDlg
 #define TkAboutDlg \
-	(tkIntPlatStubsPtr->tkAboutDlg) /* 17 */
+	(tkIntPlatStubsPtr->tkAboutDlg) /* 10 */
 #endif
 #ifndef TkCreateMacEventSource
 #define TkCreateMacEventSource \
-	(tkIntPlatStubsPtr->tkCreateMacEventSource) /* 18 */
+	(tkIntPlatStubsPtr->tkCreateMacEventSource) /* 11 */
 #endif
 #ifndef TkFontList
 #define TkFontList \
-	(tkIntPlatStubsPtr->tkFontList) /* 19 */
+	(tkIntPlatStubsPtr->tkFontList) /* 12 */
 #endif
 #ifndef TkGetTransientMaster
 #define TkGetTransientMaster \
-	(tkIntPlatStubsPtr->tkGetTransientMaster) /* 20 */
+	(tkIntPlatStubsPtr->tkGetTransientMaster) /* 13 */
 #endif
 #ifndef TkGenerateButtonEvent
 #define TkGenerateButtonEvent \
-	(tkIntPlatStubsPtr->tkGenerateButtonEvent) /* 21 */
+	(tkIntPlatStubsPtr->tkGenerateButtonEvent) /* 14 */
 #endif
 #ifndef TkGetCharPositions
 #define TkGetCharPositions \
-	(tkIntPlatStubsPtr->tkGetCharPositions) /* 22 */
+	(tkIntPlatStubsPtr->tkGetCharPositions) /* 15 */
 #endif
 #ifndef TkGenWMDestroyEvent
 #define TkGenWMDestroyEvent \
-	(tkIntPlatStubsPtr->tkGenWMDestroyEvent) /* 23 */
+	(tkIntPlatStubsPtr->tkGenWMDestroyEvent) /* 16 */
 #endif
 #ifndef TkGenWMConfigureEvent
 #define TkGenWMConfigureEvent \
-	(tkIntPlatStubsPtr->tkGenWMConfigureEvent) /* 24 */
+	(tkIntPlatStubsPtr->tkGenWMConfigureEvent) /* 17 */
 #endif
 #ifndef TkMacButtonKeyState
 #define TkMacButtonKeyState \
-	(tkIntPlatStubsPtr->tkMacButtonKeyState) /* 25 */
+	(tkIntPlatStubsPtr->tkMacButtonKeyState) /* 18 */
 #endif
 #ifndef TkMacClearMenubarActive
 #define TkMacClearMenubarActive \
-	(tkIntPlatStubsPtr->tkMacClearMenubarActive) /* 26 */
+	(tkIntPlatStubsPtr->tkMacClearMenubarActive) /* 19 */
 #endif
 #ifndef TkMacConvertEvent
 #define TkMacConvertEvent \
-	(tkIntPlatStubsPtr->tkMacConvertEvent) /* 27 */
+	(tkIntPlatStubsPtr->tkMacConvertEvent) /* 20 */
 #endif
 #ifndef TkMacDispatchMenuEvent
 #define TkMacDispatchMenuEvent \
-	(tkIntPlatStubsPtr->tkMacDispatchMenuEvent) /* 28 */
+	(tkIntPlatStubsPtr->tkMacDispatchMenuEvent) /* 21 */
 #endif
 #ifndef TkMacInstallCursor
 #define TkMacInstallCursor \
-	(tkIntPlatStubsPtr->tkMacInstallCursor) /* 29 */
+	(tkIntPlatStubsPtr->tkMacInstallCursor) /* 22 */
 #endif
 #ifndef TkMacConvertTkEvent
 #define TkMacConvertTkEvent \
-	(tkIntPlatStubsPtr->tkMacConvertTkEvent) /* 30 */
+	(tkIntPlatStubsPtr->tkMacConvertTkEvent) /* 23 */
 #endif
 #ifndef TkMacHandleTearoffMenu
 #define TkMacHandleTearoffMenu \
-	(tkIntPlatStubsPtr->tkMacHandleTearoffMenu) /* 31 */
+	(tkIntPlatStubsPtr->tkMacHandleTearoffMenu) /* 24 */
 #endif
 #ifndef tkMacInstallMWConsole
 #define tkMacInstallMWConsole \
-	(tkIntPlatStubsPtr->tkMacInstallMWConsole) /* 32 */
+	(tkIntPlatStubsPtr->tkMacInstallMWConsole) /* 25 */
 #endif
 #ifndef TkMacInvalClipRgns
 #define TkMacInvalClipRgns \
-	(tkIntPlatStubsPtr->tkMacInvalClipRgns) /* 33 */
+	(tkIntPlatStubsPtr->tkMacInvalClipRgns) /* 26 */
 #endif
 #ifndef TkMacDoHLEvent
 #define TkMacDoHLEvent \
-	(tkIntPlatStubsPtr->tkMacDoHLEvent) /* 34 */
+	(tkIntPlatStubsPtr->tkMacDoHLEvent) /* 27 */
 #endif
 #ifndef TkMacFontInfo
 #define TkMacFontInfo \
-	(tkIntPlatStubsPtr->tkMacFontInfo) /* 35 */
+	(tkIntPlatStubsPtr->tkMacFontInfo) /* 28 */
 #endif
 #ifndef TkMacGenerateTime
 #define TkMacGenerateTime \
-	(tkIntPlatStubsPtr->tkMacGenerateTime) /* 36 */
+	(tkIntPlatStubsPtr->tkMacGenerateTime) /* 29 */
 #endif
 #ifndef TkMacGetDrawablePort
 #define TkMacGetDrawablePort \
-	(tkIntPlatStubsPtr->tkMacGetDrawablePort) /* 37 */
+	(tkIntPlatStubsPtr->tkMacGetDrawablePort) /* 30 */
 #endif
 #ifndef TkMacGetScrollbarGrowWindow
 #define TkMacGetScrollbarGrowWindow \
-	(tkIntPlatStubsPtr->tkMacGetScrollbarGrowWindow) /* 38 */
+	(tkIntPlatStubsPtr->tkMacGetScrollbarGrowWindow) /* 31 */
 #endif
 #ifndef TkMacGetXWindow
 #define TkMacGetXWindow \
-	(tkIntPlatStubsPtr->tkMacGetXWindow) /* 39 */
+	(tkIntPlatStubsPtr->tkMacGetXWindow) /* 32 */
 #endif
 #ifndef TkMacGrowToplevel
 #define TkMacGrowToplevel \
-	(tkIntPlatStubsPtr->tkMacGrowToplevel) /* 40 */
+	(tkIntPlatStubsPtr->tkMacGrowToplevel) /* 33 */
 #endif
 #ifndef TkMacHandleMenuSelect
 #define TkMacHandleMenuSelect \
-	(tkIntPlatStubsPtr->tkMacHandleMenuSelect) /* 41 */
+	(tkIntPlatStubsPtr->tkMacHandleMenuSelect) /* 34 */
 #endif
 #ifndef TkMacHaveAppearance
 #define TkMacHaveAppearance \
-	(tkIntPlatStubsPtr->tkMacHaveAppearance) /* 42 */
+	(tkIntPlatStubsPtr->tkMacHaveAppearance) /* 35 */
 #endif
 #ifndef TkMacInitAppleEvents
 #define TkMacInitAppleEvents \
-	(tkIntPlatStubsPtr->tkMacInitAppleEvents) /* 43 */
+	(tkIntPlatStubsPtr->tkMacInitAppleEvents) /* 36 */
 #endif
 #ifndef TkMacInitMenus
 #define TkMacInitMenus \
-	(tkIntPlatStubsPtr->tkMacInitMenus) /* 44 */
+	(tkIntPlatStubsPtr->tkMacInitMenus) /* 37 */
 #endif
 #ifndef TkMacInvalidateWindow
 #define TkMacInvalidateWindow \
-	(tkIntPlatStubsPtr->tkMacInvalidateWindow) /* 45 */
+	(tkIntPlatStubsPtr->tkMacInvalidateWindow) /* 38 */
 #endif
 #ifndef TkMacIsCharacterMissing
 #define TkMacIsCharacterMissing \
-	(tkIntPlatStubsPtr->tkMacIsCharacterMissing) /* 46 */
+	(tkIntPlatStubsPtr->tkMacIsCharacterMissing) /* 39 */
 #endif
 #ifndef TkMacMakeRealWindowExist
 #define TkMacMakeRealWindowExist \
-	(tkIntPlatStubsPtr->tkMacMakeRealWindowExist) /* 47 */
+	(tkIntPlatStubsPtr->tkMacMakeRealWindowExist) /* 40 */
 #endif
 #ifndef TkMacMakeStippleMap
 #define TkMacMakeStippleMap \
-	(tkIntPlatStubsPtr->tkMacMakeStippleMap) /* 48 */
+	(tkIntPlatStubsPtr->tkMacMakeStippleMap) /* 41 */
 #endif
 #ifndef TkMacMenuClick
 #define TkMacMenuClick \
-	(tkIntPlatStubsPtr->tkMacMenuClick) /* 49 */
+	(tkIntPlatStubsPtr->tkMacMenuClick) /* 42 */
 #endif
 #ifndef TkMacRegisterOffScreenWindow
 #define TkMacRegisterOffScreenWindow \
-	(tkIntPlatStubsPtr->tkMacRegisterOffScreenWindow) /* 50 */
+	(tkIntPlatStubsPtr->tkMacRegisterOffScreenWindow) /* 43 */
 #endif
 #ifndef TkMacResizable
 #define TkMacResizable \
-	(tkIntPlatStubsPtr->tkMacResizable) /* 51 */
+	(tkIntPlatStubsPtr->tkMacResizable) /* 44 */
 #endif
 #ifndef TkMacSetEmbedRgn
 #define TkMacSetEmbedRgn \
-	(tkIntPlatStubsPtr->tkMacSetEmbedRgn) /* 52 */
+	(tkIntPlatStubsPtr->tkMacSetEmbedRgn) /* 45 */
 #endif
 #ifndef TkMacSetHelpMenuItemCount
 #define TkMacSetHelpMenuItemCount \
-	(tkIntPlatStubsPtr->tkMacSetHelpMenuItemCount) /* 53 */
+	(tkIntPlatStubsPtr->tkMacSetHelpMenuItemCount) /* 46 */
 #endif
 #ifndef TkMacSetScrollbarGrow
 #define TkMacSetScrollbarGrow \
-	(tkIntPlatStubsPtr->tkMacSetScrollbarGrow) /* 54 */
+	(tkIntPlatStubsPtr->tkMacSetScrollbarGrow) /* 47 */
 #endif
 #ifndef TkMacSetUpClippingRgn
 #define TkMacSetUpClippingRgn \
-	(tkIntPlatStubsPtr->tkMacSetUpClippingRgn) /* 55 */
+	(tkIntPlatStubsPtr->tkMacSetUpClippingRgn) /* 48 */
 #endif
 #ifndef TkMacSetUpGraphicsPort
 #define TkMacSetUpGraphicsPort \
-	(tkIntPlatStubsPtr->tkMacSetUpGraphicsPort) /* 56 */
+	(tkIntPlatStubsPtr->tkMacSetUpGraphicsPort) /* 49 */
 #endif
 #ifndef TkMacUpdateClipRgn
 #define TkMacUpdateClipRgn \
-	(tkIntPlatStubsPtr->tkMacUpdateClipRgn) /* 57 */
+	(tkIntPlatStubsPtr->tkMacUpdateClipRgn) /* 50 */
 #endif
 #ifndef TkMacUnregisterMacWindow
 #define TkMacUnregisterMacWindow \
-	(tkIntPlatStubsPtr->tkMacUnregisterMacWindow) /* 58 */
+	(tkIntPlatStubsPtr->tkMacUnregisterMacWindow) /* 51 */
 #endif
 #ifndef TkMacUseMenuID
 #define TkMacUseMenuID \
-	(tkIntPlatStubsPtr->tkMacUseMenuID) /* 59 */
+	(tkIntPlatStubsPtr->tkMacUseMenuID) /* 52 */
 #endif
 #ifndef TkMacVisableClipRgn
 #define TkMacVisableClipRgn \
-	(tkIntPlatStubsPtr->tkMacVisableClipRgn) /* 60 */
+	(tkIntPlatStubsPtr->tkMacVisableClipRgn) /* 53 */
 #endif
 #ifndef TkMacWinBounds
 #define TkMacWinBounds \
-	(tkIntPlatStubsPtr->tkMacWinBounds) /* 61 */
+	(tkIntPlatStubsPtr->tkMacWinBounds) /* 54 */
 #endif
 #ifndef TkMacWindowOffset
 #define TkMacWindowOffset \
-	(tkIntPlatStubsPtr->tkMacWindowOffset) /* 62 */
+	(tkIntPlatStubsPtr->tkMacWindowOffset) /* 55 */
 #endif
 #ifndef TkResumeClipboard
 #define TkResumeClipboard \
-	(tkIntPlatStubsPtr->tkResumeClipboard) /* 63 */
+	(tkIntPlatStubsPtr->tkResumeClipboard) /* 56 */
 #endif
 #ifndef TkSetMacColor
 #define TkSetMacColor \
-	(tkIntPlatStubsPtr->tkSetMacColor) /* 64 */
+	(tkIntPlatStubsPtr->tkSetMacColor) /* 57 */
 #endif
 #ifndef TkSetWMName
 #define TkSetWMName \
-	(tkIntPlatStubsPtr->tkSetWMName) /* 65 */
+	(tkIntPlatStubsPtr->tkSetWMName) /* 58 */
 #endif
 #ifndef TkSuspendClipboard
 #define TkSuspendClipboard \
-	(tkIntPlatStubsPtr->tkSuspendClipboard) /* 66 */
+	(tkIntPlatStubsPtr->tkSuspendClipboard) /* 59 */
 #endif
 #ifndef TkWMGrowToplevel
 #define TkWMGrowToplevel \
-	(tkIntPlatStubsPtr->tkWMGrowToplevel) /* 67 */
+	(tkIntPlatStubsPtr->tkWMGrowToplevel) /* 60 */
 #endif
 #ifndef TkMacZoomToplevel
 #define TkMacZoomToplevel \
-	(tkIntPlatStubsPtr->tkMacZoomToplevel) /* 68 */
+	(tkIntPlatStubsPtr->tkMacZoomToplevel) /* 61 */
 #endif
 #ifndef Tk_TopCoordsToWindow
 #define Tk_TopCoordsToWindow \
-	(tkIntPlatStubsPtr->tk_TopCoordsToWindow) /* 69 */
+	(tkIntPlatStubsPtr->tk_TopCoordsToWindow) /* 62 */
 #endif
 #ifndef TkMacContainerId
 #define TkMacContainerId \
-	(tkIntPlatStubsPtr->tkMacContainerId) /* 70 */
+	(tkIntPlatStubsPtr->tkMacContainerId) /* 63 */
 #endif
 #ifndef TkMacGetHostToplevel
 #define TkMacGetHostToplevel \
-	(tkIntPlatStubsPtr->tkMacGetHostToplevel) /* 71 */
+	(tkIntPlatStubsPtr->tkMacGetHostToplevel) /* 64 */
 #endif
 #endif /* MAC_TCL */