Remove all the long dead mac entries in tcl*.decls files

<p>re-generate all tk*Decls.h files.

FossilOrigin-Name: 4b7cb51b1d0ebd938c68fb94ce2325d463523139

7 files changed, 117 insertions, 1823 deletions

diff --git a/generic/tk.decls b/generic/tk.decls
index f752151..b64cc43 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1047,58 +1047,6 @@ declare 5 win {
 	    UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result)
 }
 
-# Mac specific functions
-
-declare 0 mac {
-    void Tk_MacSetEmbedHandler(
-	    Tk_MacEmbedRegisterWinProc *registerWinProcPtr,
-	    Tk_MacEmbedGetGrafPortProc *getPortProcPtr,
-	    Tk_MacEmbedMakeContainerExistProc *containerExistProcPtr,
-	    Tk_MacEmbedGetClipProc *getClipProc,
-	    Tk_MacEmbedGetOffsetInParentProc *getOffsetProc)
-}
-
-declare 1 mac {
-    void Tk_MacTurnOffMenus(void)
-}
-
-declare 2 mac {
-    void Tk_MacTkOwnsCursor(int tkOwnsIt)
-}
-
-declare 3 mac {
-    void TkMacInitMenus(Tcl_Interp *interp)
-}
-
-declare 4 mac {
-    void TkMacInitAppleEvents(Tcl_Interp *interp)
-}
-
-declare 5 mac {
-    int TkMacConvertEvent(EventRecord *eventPtr)
-}
-
-declare 6 mac {
-    int TkMacConvertTkEvent(EventRecord *eventPtr, Window window)
-}
-
-declare 7 mac {
-    void TkGenWMConfigureEvent(Tk_Window tkwin,
-	    int x, int y, int width, int height, int flags)
-}
-
-declare 8 mac {
-    void TkMacInvalClipRgns(TkWindow *winPtr)
-}
-
-declare 9 mac {
-    int TkMacHaveAppearance(void)
-}
-
-declare 10 mac {
-    GWorldPtr TkMacGetDrawablePort(Drawable drawable)
-}
-
 # Mac OS X specific functions
 
 declare 0 aqua {
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 9d0595d..a37f986 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -426,13 +426,13 @@ declare 119 {
     void TkUnionRectWithRegion(XRectangle *rect,
 	    TkRegion src, TkRegion dr_return)
 }
-declare 121 {mac aqua} {
+declare 121 aqua {
     Pixmap TkpCreateNativeBitmap(Display *display, const char *source)
 }
-declare 122 {mac aqua} {
+declare 122 aqua {
     void TkpDefineNativeBitmaps(void)
 }
-declare 124 {mac aqua} {
+declare 124 aqua {
     Pixmap TkpGetNativeAppBitmap(Display *display,
 	    const char *name, int *width, int *height)
 }
@@ -692,186 +692,6 @@ declare 44 win {
     void TkSendCleanup(TkDisplay *dispPtr)
 }
 ################################
-# Mac specific functions
-
-declare 0 mac {
-    void TkGenerateActivateEvents(TkWindow *winPtr, int active)
-}
-
-declare 3 mac {
-    unsigned long TkpGetMS(void)
-}
-declare 5 mac {
-    void TkPointerDeadWindow(TkWindow *winPtr)
-}
-declare 6 mac {
-    void TkpSetCapture(TkWindow *winPtr)
-}
-declare 7 mac {
-    void TkpSetCursor(TkpCursor cursor)
-}
-declare 8 mac {
-    void TkpWmSetState(TkWindow *winPtr, int state)
-}
-declare 10 mac {
-    void   TkAboutDlg(void)
-}
-declare 13 mac {
-    Window  TkGetTransientMaster(TkWindow *winPtr)
-}
-declare 14 mac {
-    int  TkGenerateButtonEvent(int x, int y,
-	    Window window, unsigned int state)
-}
-declare 16 mac {
-    void  TkGenWMDestroyEvent(Tk_Window tkwin)
-}
-# removed duplicate from tkPlat table(tk.decls)
-#declare 17 mac {
-#    void  TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y,
-#	    int width, int height, int flags)
-#}
-declare 18 mac {
-    unsigned int TkMacButtonKeyState(void)
-}
-declare 19 mac {
-    void  TkMacClearMenubarActive(void)
-}
-# removed duplicate from tkPlat table(tk.decls)
-#declare 20 mac {
-#    int  TkMacConvertEvent(EventRecord *eventPtr)
-#}
-declare 21 mac {
-    int  TkMacDispatchMenuEvent(int menuID, int index)
-}
-declare 22 mac {
-    void  TkMacInstallCursor(int resizeOverride)
-}
-# removed duplicate from tkPlat table(tk.decls)
-#declare 23 mac {
-#    int  TkMacConvertTkEvent(EventRecord *eventPtr, Window window)
-#}
-declare 24 mac {
-    void  TkMacHandleTearoffMenu(void)
-}
-# removed duplicate from tkPlat table(tk.decls)
-#declare 26 mac {
-#    void  TkMacInvalClipRgns(TkWindow *winPtr)
-#}
-declare 27 mac {
-    void  TkMacDoHLEvent(EventRecord *theEvent)
-}
-declare 29 mac {
-    Time  TkMacGenerateTime(void)
-}
-# removed duplicate from tkPlat table(tk.decls)
-#declare 30 mac {
-#    GWorldPtr  TkMacGetDrawablePort(Drawable drawable)
-#}
-declare 31 mac {
-    TkWindow *TkMacGetScrollbarGrowWindow(TkWindow *winPtr)
-}
-declare 32 mac {
-    Window   TkMacGetXWindow(WindowRef macWinPtr)
-}
-declare 33 mac {
-    int  TkMacGrowToplevel(WindowRef whichWindow, Point start)
-}
-declare 34 mac {
-    void   TkMacHandleMenuSelect(long mResult, int optionKeyPressed)
-}
-# removed duplicates from tkPlat table(tk.decls)
-#declare 35 mac {
-#    int  TkMacHaveAppearance(void)
-#}
-#
-#declare 36 mac {
-#    void  TkMacInitAppleEvents(Tcl_Interp *interp)
-#}
-#
-#declare 37 mac {
-#    void   TkMacInitMenus(Tcl_Interp  *interp)
-#}
-declare 38 mac {
-    void  TkMacInvalidateWindow(MacDrawable *macWin, int flag)
-}
-declare 39 mac {
-    int  TkMacIsCharacterMissing(Tk_Font tkfont, unsigned int searchChar)
-}
-declare 40 mac {
-    void  TkMacMakeRealWindowExist(TkWindow *winPtr)
-}
-declare 41 mac {
-    BitMapPtr TkMacMakeStippleMap(Drawable d1, Drawable d2)
-}
-declare 42 mac {
-    void  TkMacMenuClick(void)
-}
-declare 43 mac {
-    void  TkMacRegisterOffScreenWindow(Window window, GWorldPtr portPtr)
-}
-declare 44 mac {
-    int  TkMacResizable(TkWindow *winPtr)
-}
-declare 46 mac {
-    void  TkMacSetHelpMenuItemCount(void)
-}
-declare 47 mac {
-    void  TkMacSetScrollbarGrow(TkWindow *winPtr, int flag)
-}
-declare 48 mac {
-    void  TkMacSetUpClippingRgn(Drawable drawable)
-}
-declare 49 mac {
-    void  TkMacSetUpGraphicsPort(GC gc)
-}
-declare 50 mac {
-    void   TkMacUpdateClipRgn(TkWindow *winPtr)
-}
-declare 51 mac {
-    void  TkMacUnregisterMacWindow(GWorldPtr portPtr)
-}
-declare 52 mac {
-    int  TkMacUseMenuID(short macID)
-}
-declare 53 mac {
-    RgnHandle  TkMacVisableClipRgn(TkWindow *winPtr)
-}
-declare 54 mac {
-    void  TkMacWinBounds(TkWindow *winPtr, Rect *geometry)
-}
-declare 55 mac {
-    void  TkMacWindowOffset(WindowRef wRef, int *xOffset, int *yOffset)
-}
-declare 57 mac {
-    int   TkSetMacColor(unsigned long pixel, RGBColor *macColor)
-}
-declare 58 mac {
-    void   TkSetWMName(TkWindow *winPtr, Tk_Uid titleUid)
-}
-declare 59 mac {
-    void  TkSuspendClipboard(void)
-}
-declare 61 mac {
-    int  TkMacZoomToplevel(WindowPtr whichWindow, Point where, short zoomPart)
-}
-declare 62 mac {
-    Tk_Window Tk_TopCoordsToWindow(Tk_Window tkwin,
-	    int rootX, int rootY, int *newX, int *newY)
-}
-declare 63 mac {
-    MacDrawable *TkMacContainerId(TkWindow *winPtr)
-}
-declare 64 mac {
-    MacDrawable *TkMacGetHostToplevel(TkWindow *winPtr)
-}
-declare 65 mac {
-    void TkMacPreprocessMenu(void)
-}
-declare 66 mac {
-    int TkpIsWindowFloating(WindowRef window)
-}
-################################
 # Aqua specific functions
 
 declare 0 aqua {
@@ -1462,321 +1282,321 @@ declare 114 win {
 }
 
 ################################
-# X functions for Mac and Aqua
+# X functions for Aqua
 
-declare 0 {mac aqua} {
+declare 0 aqua {
     int XSetDashes(Display *display, GC gc, int dash_offset,
 	    _Xconst char *dash_list, int n)
 }
-declare 1 {mac aqua} {
+declare 1 aqua {
     XModifierKeymap *XGetModifierMapping(Display *d)
 }
-declare 2 {mac aqua} {
+declare 2 aqua {
     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 3 {mac aqua} {
+declare 3 aqua {
     XImage *XGetImage(Display *d, Drawable dr, int i1, int i2,
 	    unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)
 }
-declare 4 {mac aqua} {
+declare 4 aqua {
     char *XGetAtomName(Display *d, Atom a)
 }
-declare 5 {mac aqua} {
+declare 5 aqua {
     char *XKeysymToString(KeySym k)
 }
-declare 6 {mac aqua} {
+declare 6 aqua {
     Colormap XCreateColormap(Display *d, Window w, Visual *v, int i)
 }
-declare 7 {mac aqua} {
+declare 7 aqua {
     GContext XGContextFromGC(GC g)
 }
-declare 8 {mac aqua} {
+declare 8 aqua {
     KeySym XKeycodeToKeysym(Display *d, KeyCode k, int i)
 }
-declare 9 {mac aqua} {
+declare 9 aqua {
     KeySym XStringToKeysym(_Xconst char *c)
 }
-declare 10 {mac aqua} {
+declare 10 aqua {
     Window XRootWindow(Display *d, int i)
 }
-declare 11 {mac aqua} {
+declare 11 aqua {
     XErrorHandler XSetErrorHandler(XErrorHandler x)
 }
-declare 12 {mac aqua} {
+declare 12 aqua {
     Status XAllocColor(Display *d, Colormap c, XColor *xp)
 }
-declare 13 {mac aqua} {
+declare 13 aqua {
     int XBell(Display *d, int i)
 }
-declare 14 {mac aqua} {
+declare 14 aqua {
     void XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1,
 	    int i2, _Xconst unsigned char *c, int i3)
 }
-declare 15 {mac aqua} {
+declare 15 aqua {
     void XChangeWindowAttributes(Display *d, Window w, unsigned long ul,
 	    XSetWindowAttributes *x)
 }
-declare 16 {mac aqua} {
+declare 16 aqua {
     void XConfigureWindow(Display *d, Window w, unsigned int i,
 	    XWindowChanges *x)
 }
-declare 17 {mac aqua} {
+declare 17 aqua {
     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 18 {mac aqua} {
+declare 18 aqua {
     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 19 {mac aqua} {
+declare 19 aqua {
     Pixmap XCreateBitmapFromData(Display *display, Drawable d,
 	    _Xconst char *data, unsigned int width, unsigned int height)
 }
-declare 20 {mac aqua} {
+declare 20 aqua {
     int XDefineCursor(Display *d, Window w, Cursor c)
 }
-declare 21 {mac aqua} {
+declare 21 aqua {
     void XDestroyWindow(Display *d, Window w)
 }
-declare 22 {mac aqua} {
+declare 22 aqua {
     void XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2,
 	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
-declare 23 {mac aqua} {
+declare 23 aqua {
     int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)
 }
-declare 24 {mac aqua} {
+declare 24 aqua {
     void XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2,
 	    unsigned int ui1, unsigned int ui2)
 }
-declare 25 {mac aqua} {
+declare 25 aqua {
     void XFillArc(Display *d, Drawable dr, GC g, int i1, int i2,
 	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
-declare 26 {mac aqua} {
+declare 26 aqua {
     void XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x,
 	    int i1, int i2, int i3)
 }
-declare 27 {mac aqua} {
+declare 27 aqua {
     int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i)
 }
-declare 28 {mac aqua} {
+declare 28 aqua {
     int XFreeColormap(Display *d, Colormap c)
 }
-declare 29 {mac aqua} {
+declare 29 aqua {
     int XFreeColors(Display *d, Colormap c,
 	    unsigned long *ulp, int i, unsigned long ul)
 }
-declare 30 {mac aqua} {
+declare 30 aqua {
     int XFreeModifiermap(XModifierKeymap *x)
 }
-declare 31 {mac aqua} {
+declare 31 aqua {
     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 32 {mac aqua} {
+declare 32 aqua {
     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 33 {mac aqua} {
+declare 33 aqua {
     int XGrabKeyboard(Display *d, Window w, Bool b, int i1, int i2, Time t)
 }
-declare 34 {mac aqua} {
+declare 34 aqua {
     int XGrabPointer(Display *d, Window w1, Bool b, unsigned int ui,
 	    int i1, int i2, Window w2, Cursor c, Time t)
 }
-declare 35 {mac aqua} {
+declare 35 aqua {
     KeyCode XKeysymToKeycode(Display *d, KeySym k)
 }
-declare 36 {mac aqua} {
+declare 36 aqua {
     void XMapWindow(Display *d, Window w)
 }
-declare 37 {mac aqua} {
+declare 37 aqua {
     void XMoveResizeWindow(Display *d, Window w, int i1, int i2,
 	    unsigned int ui1, unsigned int ui2)
 }
-declare 38 {mac aqua} {
+declare 38 aqua {
     void XMoveWindow(Display *d, Window w, int i1, int i2)
 }
-declare 39 {mac aqua} {
+declare 39 aqua {
     Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3,
 	    int *i1, int *i2, int *i3, int *i4, unsigned int *ui)
 }
-declare 40 {mac aqua} {
+declare 40 aqua {
     void XRaiseWindow(Display *d, Window w)
 }
-declare 41 {mac aqua} {
+declare 41 aqua {
     void XRefreshKeyboardMapping(XMappingEvent *x)
 }
-declare 42 {mac aqua} {
+declare 42 aqua {
     void XResizeWindow(Display *d, Window w, unsigned int ui1,
 	    unsigned int ui2)
 }
-declare 43 {mac aqua} {
+declare 43 aqua {
     void XSelectInput(Display *d, Window w, long l)
 }
-declare 44 {mac aqua} {
+declare 44 aqua {
     Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x)
 }
-declare 45 {mac aqua} {
+declare 45 aqua {
     void XSetIconName(Display *d, Window w, _Xconst char *c)
 }
-declare 46 {mac aqua} {
+declare 46 aqua {
     void XSetInputFocus(Display *d, Window w, int i, Time t)
 }
-declare 47 {mac aqua} {
+declare 47 aqua {
     int XSetSelectionOwner(Display *d, Atom a, Window w, Time t)
 }
-declare 48 {mac aqua} {
+declare 48 aqua {
     void XSetWindowBackground(Display *d, Window w, unsigned long ul)
 }
-declare 49 {mac aqua} {
+declare 49 aqua {
     void XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p)
 }
-declare 50 {mac aqua} {
+declare 50 aqua {
     void XSetWindowBorder(Display *d, Window w, unsigned long ul)
 }
-declare 51 {mac aqua} {
+declare 51 aqua {
     void XSetWindowBorderPixmap(Display *d, Window w, Pixmap p)
 }
-declare 52 {mac aqua} {
+declare 52 aqua {
     void XSetWindowBorderWidth(Display *d, Window w, unsigned int ui)
 }
-declare 53 {mac aqua} {
+declare 53 aqua {
     void XSetWindowColormap(Display *d, Window w, Colormap c)
 }
-declare 54 {mac aqua} {
+declare 54 aqua {
     void XUngrabKeyboard(Display *d, Time t)
 }
-declare 55 {mac aqua} {
+declare 55 aqua {
     int XUngrabPointer(Display *d, Time t)
 }
-declare 56 {mac aqua} {
+declare 56 aqua {
     void XUnmapWindow(Display *d, Window w)
 }
-declare 57 {mac aqua} {
+declare 57 aqua {
     int TkPutImage(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)
 }
-declare 58 {mac aqua} {
+declare 58 aqua {
     Status XParseColor(Display *display, Colormap map,
           _Xconst char *spec, XColor *colorPtr)
 }
-declare 59 {mac aqua} {
+declare 59 aqua {
     GC XCreateGC(Display *display, Drawable d,
 	    unsigned long valuemask, XGCValues *values)
 }
-declare 60 {mac aqua} {
+declare 60 aqua {
     int XFreeGC(Display *display, GC gc)
 }
-declare 61 {mac aqua} {
+declare 61 aqua {
     Atom XInternAtom(Display *display, _Xconst char *atom_name,
 	    Bool only_if_exists)
 }
-declare 62 {mac aqua} {
+declare 62 aqua {
     int XSetBackground(Display *display, GC gc, unsigned long foreground)
 }
-declare 63 {mac aqua} {
+declare 63 aqua {
     int XSetForeground(Display *display, GC gc, unsigned long foreground)
 }
-declare 64 {mac aqua} {
+declare 64 aqua {
     int XSetClipMask(Display *display, GC gc, Pixmap pixmap)
 }
-declare 65 {mac aqua} {
+declare 65 aqua {
     int XSetClipOrigin(Display *display, GC gc,
 	    int clip_x_origin, int clip_y_origin)
 }
-declare 66 {mac aqua} {
+declare 66 aqua {
     int XSetTSOrigin(Display *display, GC gc,
 	    int ts_x_origin, int ts_y_origin)
 }
-declare 67 {mac aqua} {
+declare 67 aqua {
     int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values)
 }
-declare 68 {mac aqua} {
+declare 68 aqua {
     int XSetFont(Display *display, GC gc, Font font)
 }
-declare 69 {mac aqua} {
+declare 69 aqua {
     int XSetArcMode(Display *display, GC gc, int arc_mode)
 }
-declare 70 {mac aqua} {
+declare 70 aqua {
     int XSetStipple(Display *display, GC gc, Pixmap stipple)
 }
-declare 71 {mac aqua} {
+declare 71 aqua {
     int XSetFillRule(Display *display, GC gc, int fill_rule)
 }
-declare 72 {mac aqua} {
+declare 72 aqua {
     int XSetFillStyle(Display *display, GC gc, int fill_style)
 }
-declare 73 {mac aqua} {
+declare 73 aqua {
     int XSetFunction(Display *display, GC gc, int function)
 }
-declare 74 {mac aqua} {
+declare 74 aqua {
     int XSetLineAttributes(Display *display, GC gc, unsigned int line_width,
 	    int line_style, int cap_style, int join_style)
 }
-declare 75 {mac aqua} {
+declare 75 aqua {
     int _XInitImageFuncPtrs(XImage *image)
 }
-declare 76 {mac aqua} {
+declare 76 aqua {
     XIC XCreateIC(void)
 }
-declare 77 {mac aqua} {
+declare 77 aqua {
     XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask,
 	    XVisualInfo *vinfo_template, int *nitems_return)
 }
-declare 78 {mac aqua} {
+declare 78 aqua {
     void XSetWMClientMachine(Display *display, Window w,
 	    XTextProperty *text_prop)
 }
-declare 79 {mac aqua} {
+declare 79 aqua {
     Status XStringListToTextProperty(char **list, int count,
 	    XTextProperty *text_prop_return)
 }
-declare 80 {mac aqua} {
+declare 80 aqua {
     void XDrawSegments(Display *display, Drawable d, GC gc,
 	    XSegment *segments, int nsegments)
 }
-declare 81 {mac aqua} {
+declare 81 aqua {
     void XForceScreenSaver(Display *display, int mode)
 }
-declare 82 {mac aqua} {
+declare 82 aqua {
     int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1,
 	    int x2, int y2)
 }
-declare 83 {mac aqua} {
+declare 83 aqua {
     int XFillRectangle(Display *display, Drawable d, GC gc,
 	    int x, int y, unsigned int width, unsigned int height)
 }
-declare 84 {mac aqua} {
+declare 84 aqua {
     void XClearWindow(Display *d, Window w)
 }
-declare 85 {mac aqua} {
+declare 85 aqua {
     void XDrawPoint(Display *display, Drawable d, GC gc, int x, int y)
 }
-declare 86 {mac aqua} {
+declare 86 aqua {
     void XDrawPoints(Display *display, Drawable d, GC gc, XPoint *points,
 	    int npoints, int mode)
 }
-declare 87 {mac aqua} {
+declare 87 aqua {
     int XWarpPointer(Display *display, Window src_w, Window dest_w,
 	    int src_x, int src_y, unsigned int src_width,
 	    unsigned int src_height, int dest_x, int dest_y)
 }
-declare 88 {mac aqua} {
+declare 88 aqua {
     void XQueryColor(Display *display, Colormap colormap, XColor *def_in_out)
 }
-declare 89 {mac aqua} {
+declare 89 aqua {
     void XQueryColors(Display *display, Colormap colormap,
 	    XColor *defs_in_out, int ncolors)
 }
-declare 90 {mac aqua} {
+declare 90 aqua {
     Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3,
 	    Window **w4, unsigned int *ui)
 }
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index c9b86d3..a590cf2 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -383,30 +383,16 @@ EXTERN void		TkSetRegion _ANSI_ARGS_((Display *display, GC gc,
 EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle *rect,
 				TkRegion src, TkRegion dr_return));
 /* Slot 120 is reserved */
-#ifdef MAC_TCL
-/* 121 */
-EXTERN Pixmap		TkpCreateNativeBitmap _ANSI_ARGS_((Display *display,
-				CONST char *source));
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
 /* 121 */
 EXTERN Pixmap		TkpCreateNativeBitmap _ANSI_ARGS_((Display *display,
 				CONST char *source));
 #endif /* AQUA */
-#ifdef MAC_TCL
-/* 122 */
-EXTERN void		TkpDefineNativeBitmaps _ANSI_ARGS_((void));
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
 /* 122 */
 EXTERN void		TkpDefineNativeBitmaps _ANSI_ARGS_((void));
 #endif /* AQUA */
 /* Slot 123 is reserved */
-#ifdef MAC_TCL
-/* 124 */
-EXTERN Pixmap		TkpGetNativeAppBitmap _ANSI_ARGS_((Display *display,
-				CONST char *name, int *width, int *height));
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
 /* 124 */
 EXTERN Pixmap		TkpGetNativeAppBitmap _ANSI_ARGS_((Display *display,
@@ -594,41 +580,35 @@ typedef struct TkIntStubs {
     void (*tkSetRegion) _ANSI_ARGS_((Display *display, GC gc, TkRegion rgn)); /* 118 */
     void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle *rect, TkRegion src, TkRegion dr_return)); /* 119 */
     VOID *reserved120;
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     VOID *reserved121;
-#endif /* UNIX */
+#endif /* X11 */
 #if defined(__WIN32__) /* WIN */
     VOID *reserved121;
 #endif /* WIN */
-#ifdef MAC_TCL
-    Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display *display, CONST char *source)); /* 121 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
+    VOID *reserved121; /* Dummy entry for stubs table backwards compatibility */
     Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display *display, CONST char *source)); /* 121 */
 #endif /* AQUA */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     VOID *reserved122;
-#endif /* UNIX */
+#endif /* X11 */
 #if defined(__WIN32__) /* WIN */
     VOID *reserved122;
 #endif /* WIN */
-#ifdef MAC_TCL
-    void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 122 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
+    VOID *reserved122; /* Dummy entry for stubs table backwards compatibility */
     void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 122 */
 #endif /* AQUA */
     VOID *reserved123;
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     VOID *reserved124;
-#endif /* UNIX */
+#endif /* X11 */
 #if defined(__WIN32__) /* WIN */
     VOID *reserved124;
 #endif /* WIN */
-#ifdef MAC_TCL
-    Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display *display, CONST char *name, int *width, int *height)); /* 124 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
+    VOID *reserved124; /* Dummy entry for stubs table backwards compatibility */
     Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display *display, CONST char *name, int *width, int *height)); /* 124 */
 #endif /* AQUA */
     VOID *reserved125;
@@ -1153,24 +1133,12 @@ extern TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */
 #endif
 /* Slot 120 is reserved */
-#ifdef MAC_TCL
-#ifndef TkpCreateNativeBitmap
-#define TkpCreateNativeBitmap \
-	(tkIntStubsPtr->tkpCreateNativeBitmap) /* 121 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkpCreateNativeBitmap
 #define TkpCreateNativeBitmap \
 	(tkIntStubsPtr->tkpCreateNativeBitmap) /* 121 */
 #endif
 #endif /* AQUA */
-#ifdef MAC_TCL
-#ifndef TkpDefineNativeBitmaps
-#define TkpDefineNativeBitmaps \
-	(tkIntStubsPtr->tkpDefineNativeBitmaps) /* 122 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkpDefineNativeBitmaps
 #define TkpDefineNativeBitmaps \
@@ -1178,12 +1146,6 @@ extern TkIntStubs *tkIntStubsPtr;
 #endif
 #endif /* AQUA */
 /* Slot 123 is reserved */
-#ifdef MAC_TCL
-#ifndef TkpGetNativeAppBitmap
-#define TkpGetNativeAppBitmap \
-	(tkIntStubsPtr->tkpGetNativeAppBitmap) /* 124 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkpGetNativeAppBitmap
 #define TkpGetNativeAppBitmap \
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index badb8b6..eb05c02 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -145,142 +145,6 @@ EXTERN void		TkWmCleanup _ANSI_ARGS_((TkDisplay *dispPtr));
 /* 44 */
 EXTERN void		TkSendCleanup _ANSI_ARGS_((TkDisplay *dispPtr));
 #endif /* WIN */
-#ifdef MAC_TCL
-/* 0 */
-EXTERN void		TkGenerateActivateEvents _ANSI_ARGS_((
-				TkWindow *winPtr, int active));
-/* Slot 1 is reserved */
-/* Slot 2 is reserved */
-/* 3 */
-EXTERN unsigned long	TkpGetMS _ANSI_ARGS_((void));
-/* Slot 4 is reserved */
-/* 5 */
-EXTERN void		TkPointerDeadWindow _ANSI_ARGS_((TkWindow *winPtr));
-/* 6 */
-EXTERN void		TkpSetCapture _ANSI_ARGS_((TkWindow *winPtr));
-/* 7 */
-EXTERN void		TkpSetCursor _ANSI_ARGS_((TkpCursor cursor));
-/* 8 */
-EXTERN void		TkpWmSetState _ANSI_ARGS_((TkWindow *winPtr,
-				int state));
-/* Slot 9 is reserved */
-/* 10 */
-EXTERN void		TkAboutDlg _ANSI_ARGS_((void));
-/* Slot 11 is reserved */
-/* Slot 12 is reserved */
-/* 13 */
-EXTERN Window		TkGetTransientMaster _ANSI_ARGS_((TkWindow *winPtr));
-/* 14 */
-EXTERN int		TkGenerateButtonEvent _ANSI_ARGS_((int x, int y,
-				Window window, unsigned int state));
-/* Slot 15 is reserved */
-/* 16 */
-EXTERN void		TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin));
-/* Slot 17 is reserved */
-/* 18 */
-EXTERN unsigned int	TkMacButtonKeyState _ANSI_ARGS_((void));
-/* 19 */
-EXTERN void		TkMacClearMenubarActive _ANSI_ARGS_((void));
-/* Slot 20 is reserved */
-/* 21 */
-EXTERN int		TkMacDispatchMenuEvent _ANSI_ARGS_((int menuID,
-				int index));
-/* 22 */
-EXTERN void		TkMacInstallCursor _ANSI_ARGS_((int resizeOverride));
-/* Slot 23 is reserved */
-/* 24 */
-EXTERN void		TkMacHandleTearoffMenu _ANSI_ARGS_((void));
-/* Slot 25 is reserved */
-/* Slot 26 is reserved */
-/* 27 */
-EXTERN void		TkMacDoHLEvent _ANSI_ARGS_((EventRecord *theEvent));
-/* Slot 28 is reserved */
-/* 29 */
-EXTERN Time		TkMacGenerateTime _ANSI_ARGS_((void));
-/* Slot 30 is reserved */
-/* 31 */
-EXTERN TkWindow *	TkMacGetScrollbarGrowWindow _ANSI_ARGS_((
-				TkWindow *winPtr));
-/* 32 */
-EXTERN Window		TkMacGetXWindow _ANSI_ARGS_((WindowRef macWinPtr));
-/* 33 */
-EXTERN int		TkMacGrowToplevel _ANSI_ARGS_((WindowRef whichWindow,
-				Point start));
-/* 34 */
-EXTERN void		TkMacHandleMenuSelect _ANSI_ARGS_((long mResult,
-				int optionKeyPressed));
-/* Slot 35 is reserved */
-/* Slot 36 is reserved */
-/* Slot 37 is reserved */
-/* 38 */
-EXTERN void		TkMacInvalidateWindow _ANSI_ARGS_((
-				MacDrawable *macWin, int flag));
-/* 39 */
-EXTERN int		TkMacIsCharacterMissing _ANSI_ARGS_((Tk_Font tkfont,
-				unsigned int searchChar));
-/* 40 */
-EXTERN void		TkMacMakeRealWindowExist _ANSI_ARGS_((
-				TkWindow *winPtr));
-/* 41 */
-EXTERN BitMapPtr	TkMacMakeStippleMap _ANSI_ARGS_((Drawable d1,
-				Drawable d2));
-/* 42 */
-EXTERN void		TkMacMenuClick _ANSI_ARGS_((void));
-/* 43 */
-EXTERN void		TkMacRegisterOffScreenWindow _ANSI_ARGS_((
-				Window window, GWorldPtr portPtr));
-/* 44 */
-EXTERN int		TkMacResizable _ANSI_ARGS_((TkWindow *winPtr));
-/* Slot 45 is reserved */
-/* 46 */
-EXTERN void		TkMacSetHelpMenuItemCount _ANSI_ARGS_((void));
-/* 47 */
-EXTERN void		TkMacSetScrollbarGrow _ANSI_ARGS_((TkWindow *winPtr,
-				int flag));
-/* 48 */
-EXTERN void		TkMacSetUpClippingRgn _ANSI_ARGS_((Drawable drawable));
-/* 49 */
-EXTERN void		TkMacSetUpGraphicsPort _ANSI_ARGS_((GC gc));
-/* 50 */
-EXTERN void		TkMacUpdateClipRgn _ANSI_ARGS_((TkWindow *winPtr));
-/* 51 */
-EXTERN void		TkMacUnregisterMacWindow _ANSI_ARGS_((
-				GWorldPtr portPtr));
-/* 52 */
-EXTERN int		TkMacUseMenuID _ANSI_ARGS_((short macID));
-/* 53 */
-EXTERN RgnHandle	TkMacVisableClipRgn _ANSI_ARGS_((TkWindow *winPtr));
-/* 54 */
-EXTERN void		TkMacWinBounds _ANSI_ARGS_((TkWindow *winPtr,
-				Rect *geometry));
-/* 55 */
-EXTERN void		TkMacWindowOffset _ANSI_ARGS_((WindowRef wRef,
-				int *xOffset, int *yOffset));
-/* Slot 56 is reserved */
-/* 57 */
-EXTERN int		TkSetMacColor _ANSI_ARGS_((unsigned long pixel,
-				RGBColor *macColor));
-/* 58 */
-EXTERN void		TkSetWMName _ANSI_ARGS_((TkWindow *winPtr,
-				Tk_Uid titleUid));
-/* 59 */
-EXTERN void		TkSuspendClipboard _ANSI_ARGS_((void));
-/* Slot 60 is reserved */
-/* 61 */
-EXTERN int		TkMacZoomToplevel _ANSI_ARGS_((WindowPtr whichWindow,
-				Point where, short zoomPart));
-/* 62 */
-EXTERN Tk_Window	Tk_TopCoordsToWindow _ANSI_ARGS_((Tk_Window tkwin,
-				int rootX, int rootY, int *newX, int *newY));
-/* 63 */
-EXTERN MacDrawable *	TkMacContainerId _ANSI_ARGS_((TkWindow *winPtr));
-/* 64 */
-EXTERN MacDrawable *	TkMacGetHostToplevel _ANSI_ARGS_((TkWindow *winPtr));
-/* 65 */
-EXTERN void		TkMacPreprocessMenu _ANSI_ARGS_((void));
-/* 66 */
-EXTERN int		TkpIsWindowFloating _ANSI_ARGS_((WindowRef window));
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
 /* 0 */
 EXTERN void		TkGenerateActivateEvents _ANSI_ARGS_((
@@ -406,7 +270,7 @@ EXTERN void		TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin));
 /* 53 */
 EXTERN unsigned long	TkpGetMS _ANSI_ARGS_((void));
 #endif /* AQUA */
-#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
 /* 0 */
 EXTERN void		TkCreateXEventSource _ANSI_ARGS_((void));
 /* 1 */
@@ -491,75 +355,6 @@ typedef struct TkIntPlatStubs {
     void (*tkWmCleanup) _ANSI_ARGS_((TkDisplay *dispPtr)); /* 43 */
     void (*tkSendCleanup) _ANSI_ARGS_((TkDisplay *dispPtr)); /* 44 */
 #endif /* WIN */
-#ifdef MAC_TCL
-    void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow *winPtr, int active)); /* 0 */
-    VOID *reserved1;
-    VOID *reserved2;
-    unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 3 */
-    VOID *reserved4;
-    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 */
-    VOID *reserved9;
-    void (*tkAboutDlg) _ANSI_ARGS_((void)); /* 10 */
-    VOID *reserved11;
-    VOID *reserved12;
-    Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow *winPtr)); /* 13 */
-    int (*tkGenerateButtonEvent) _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* 14 */
-    VOID *reserved15;
-    void (*tkGenWMDestroyEvent) _ANSI_ARGS_((Tk_Window tkwin)); /* 16 */
-    VOID *reserved17;
-    unsigned int (*tkMacButtonKeyState) _ANSI_ARGS_((void)); /* 18 */
-    void (*tkMacClearMenubarActive) _ANSI_ARGS_((void)); /* 19 */
-    VOID *reserved20;
-    int (*tkMacDispatchMenuEvent) _ANSI_ARGS_((int menuID, int index)); /* 21 */
-    void (*tkMacInstallCursor) _ANSI_ARGS_((int resizeOverride)); /* 22 */
-    VOID *reserved23;
-    void (*tkMacHandleTearoffMenu) _ANSI_ARGS_((void)); /* 24 */
-    VOID *reserved25;
-    VOID *reserved26;
-    void (*tkMacDoHLEvent) _ANSI_ARGS_((EventRecord *theEvent)); /* 27 */
-    VOID *reserved28;
-    Time (*tkMacGenerateTime) _ANSI_ARGS_((void)); /* 29 */
-    VOID *reserved30;
-    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 */
-    VOID *reserved35;
-    VOID *reserved36;
-    VOID *reserved37;
-    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 *reserved45;
-    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 *reserved56;
-    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 */
-    VOID *reserved60;
-    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 */
-    void (*tkMacPreprocessMenu) _ANSI_ARGS_((void)); /* 65 */
-    int (*tkpIsWindowFloating) _ANSI_ARGS_((WindowRef window)); /* 66 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
     void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow *winPtr, int active)); /* 0 */
     VOID *reserved1;
@@ -616,7 +411,7 @@ typedef struct TkIntPlatStubs {
     VOID *reserved52;
     unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 53 */
 #endif /* AQUA */
-#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
     void (*tkCreateXEventSource) _ANSI_ARGS_((void)); /* 0 */
     void (*tkFreeWindowId) _ANSI_ARGS_((TkDisplay *dispPtr, Window w)); /* 1 */
     void (*tkInitXId) _ANSI_ARGS_((TkDisplay *dispPtr)); /* 2 */
@@ -826,216 +621,6 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkSendCleanup) /* 44 */
 #endif
 #endif /* WIN */
-#ifdef MAC_TCL
-#ifndef TkGenerateActivateEvents
-#define TkGenerateActivateEvents \
-	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */
-#endif
-/* Slot 1 is reserved */
-/* Slot 2 is reserved */
-#ifndef TkpGetMS
-#define TkpGetMS \
-	(tkIntPlatStubsPtr->tkpGetMS) /* 3 */
-#endif
-/* Slot 4 is reserved */
-#ifndef TkPointerDeadWindow
-#define TkPointerDeadWindow \
-	(tkIntPlatStubsPtr->tkPointerDeadWindow) /* 5 */
-#endif
-#ifndef TkpSetCapture
-#define TkpSetCapture \
-	(tkIntPlatStubsPtr->tkpSetCapture) /* 6 */
-#endif
-#ifndef TkpSetCursor
-#define TkpSetCursor \
-	(tkIntPlatStubsPtr->tkpSetCursor) /* 7 */
-#endif
-#ifndef TkpWmSetState
-#define TkpWmSetState \
-	(tkIntPlatStubsPtr->tkpWmSetState) /* 8 */
-#endif
-/* Slot 9 is reserved */
-#ifndef TkAboutDlg
-#define TkAboutDlg \
-	(tkIntPlatStubsPtr->tkAboutDlg) /* 10 */
-#endif
-/* Slot 11 is reserved */
-/* Slot 12 is reserved */
-#ifndef TkGetTransientMaster
-#define TkGetTransientMaster \
-	(tkIntPlatStubsPtr->tkGetTransientMaster) /* 13 */
-#endif
-#ifndef TkGenerateButtonEvent
-#define TkGenerateButtonEvent \
-	(tkIntPlatStubsPtr->tkGenerateButtonEvent) /* 14 */
-#endif
-/* Slot 15 is reserved */
-#ifndef TkGenWMDestroyEvent
-#define TkGenWMDestroyEvent \
-	(tkIntPlatStubsPtr->tkGenWMDestroyEvent) /* 16 */
-#endif
-/* Slot 17 is reserved */
-#ifndef TkMacButtonKeyState
-#define TkMacButtonKeyState \
-	(tkIntPlatStubsPtr->tkMacButtonKeyState) /* 18 */
-#endif
-#ifndef TkMacClearMenubarActive
-#define TkMacClearMenubarActive \
-	(tkIntPlatStubsPtr->tkMacClearMenubarActive) /* 19 */
-#endif
-/* Slot 20 is reserved */
-#ifndef TkMacDispatchMenuEvent
-#define TkMacDispatchMenuEvent \
-	(tkIntPlatStubsPtr->tkMacDispatchMenuEvent) /* 21 */
-#endif
-#ifndef TkMacInstallCursor
-#define TkMacInstallCursor \
-	(tkIntPlatStubsPtr->tkMacInstallCursor) /* 22 */
-#endif
-/* Slot 23 is reserved */
-#ifndef TkMacHandleTearoffMenu
-#define TkMacHandleTearoffMenu \
-	(tkIntPlatStubsPtr->tkMacHandleTearoffMenu) /* 24 */
-#endif
-/* Slot 25 is reserved */
-/* Slot 26 is reserved */
-#ifndef TkMacDoHLEvent
-#define TkMacDoHLEvent \
-	(tkIntPlatStubsPtr->tkMacDoHLEvent) /* 27 */
-#endif
-/* Slot 28 is reserved */
-#ifndef TkMacGenerateTime
-#define TkMacGenerateTime \
-	(tkIntPlatStubsPtr->tkMacGenerateTime) /* 29 */
-#endif
-/* Slot 30 is reserved */
-#ifndef TkMacGetScrollbarGrowWindow
-#define TkMacGetScrollbarGrowWindow \
-	(tkIntPlatStubsPtr->tkMacGetScrollbarGrowWindow) /* 31 */
-#endif
-#ifndef TkMacGetXWindow
-#define TkMacGetXWindow \
-	(tkIntPlatStubsPtr->tkMacGetXWindow) /* 32 */
-#endif
-#ifndef TkMacGrowToplevel
-#define TkMacGrowToplevel \
-	(tkIntPlatStubsPtr->tkMacGrowToplevel) /* 33 */
-#endif
-#ifndef TkMacHandleMenuSelect
-#define TkMacHandleMenuSelect \
-	(tkIntPlatStubsPtr->tkMacHandleMenuSelect) /* 34 */
-#endif
-/* Slot 35 is reserved */
-/* Slot 36 is reserved */
-/* Slot 37 is reserved */
-#ifndef TkMacInvalidateWindow
-#define TkMacInvalidateWindow \
-	(tkIntPlatStubsPtr->tkMacInvalidateWindow) /* 38 */
-#endif
-#ifndef TkMacIsCharacterMissing
-#define TkMacIsCharacterMissing \
-	(tkIntPlatStubsPtr->tkMacIsCharacterMissing) /* 39 */
-#endif
-#ifndef TkMacMakeRealWindowExist
-#define TkMacMakeRealWindowExist \
-	(tkIntPlatStubsPtr->tkMacMakeRealWindowExist) /* 40 */
-#endif
-#ifndef TkMacMakeStippleMap
-#define TkMacMakeStippleMap \
-	(tkIntPlatStubsPtr->tkMacMakeStippleMap) /* 41 */
-#endif
-#ifndef TkMacMenuClick
-#define TkMacMenuClick \
-	(tkIntPlatStubsPtr->tkMacMenuClick) /* 42 */
-#endif
-#ifndef TkMacRegisterOffScreenWindow
-#define TkMacRegisterOffScreenWindow \
-	(tkIntPlatStubsPtr->tkMacRegisterOffScreenWindow) /* 43 */
-#endif
-#ifndef TkMacResizable
-#define TkMacResizable \
-	(tkIntPlatStubsPtr->tkMacResizable) /* 44 */
-#endif
-/* Slot 45 is reserved */
-#ifndef TkMacSetHelpMenuItemCount
-#define TkMacSetHelpMenuItemCount \
-	(tkIntPlatStubsPtr->tkMacSetHelpMenuItemCount) /* 46 */
-#endif
-#ifndef TkMacSetScrollbarGrow
-#define TkMacSetScrollbarGrow \
-	(tkIntPlatStubsPtr->tkMacSetScrollbarGrow) /* 47 */
-#endif
-#ifndef TkMacSetUpClippingRgn
-#define TkMacSetUpClippingRgn \
-	(tkIntPlatStubsPtr->tkMacSetUpClippingRgn) /* 48 */
-#endif
-#ifndef TkMacSetUpGraphicsPort
-#define TkMacSetUpGraphicsPort \
-	(tkIntPlatStubsPtr->tkMacSetUpGraphicsPort) /* 49 */
-#endif
-#ifndef TkMacUpdateClipRgn
-#define TkMacUpdateClipRgn \
-	(tkIntPlatStubsPtr->tkMacUpdateClipRgn) /* 50 */
-#endif
-#ifndef TkMacUnregisterMacWindow
-#define TkMacUnregisterMacWindow \
-	(tkIntPlatStubsPtr->tkMacUnregisterMacWindow) /* 51 */
-#endif
-#ifndef TkMacUseMenuID
-#define TkMacUseMenuID \
-	(tkIntPlatStubsPtr->tkMacUseMenuID) /* 52 */
-#endif
-#ifndef TkMacVisableClipRgn
-#define TkMacVisableClipRgn \
-	(tkIntPlatStubsPtr->tkMacVisableClipRgn) /* 53 */
-#endif
-#ifndef TkMacWinBounds
-#define TkMacWinBounds \
-	(tkIntPlatStubsPtr->tkMacWinBounds) /* 54 */
-#endif
-#ifndef TkMacWindowOffset
-#define TkMacWindowOffset \
-	(tkIntPlatStubsPtr->tkMacWindowOffset) /* 55 */
-#endif
-/* Slot 56 is reserved */
-#ifndef TkSetMacColor
-#define TkSetMacColor \
-	(tkIntPlatStubsPtr->tkSetMacColor) /* 57 */
-#endif
-#ifndef TkSetWMName
-#define TkSetWMName \
-	(tkIntPlatStubsPtr->tkSetWMName) /* 58 */
-#endif
-#ifndef TkSuspendClipboard
-#define TkSuspendClipboard \
-	(tkIntPlatStubsPtr->tkSuspendClipboard) /* 59 */
-#endif
-/* Slot 60 is reserved */
-#ifndef TkMacZoomToplevel
-#define TkMacZoomToplevel \
-	(tkIntPlatStubsPtr->tkMacZoomToplevel) /* 61 */
-#endif
-#ifndef Tk_TopCoordsToWindow
-#define Tk_TopCoordsToWindow \
-	(tkIntPlatStubsPtr->tk_TopCoordsToWindow) /* 62 */
-#endif
-#ifndef TkMacContainerId
-#define TkMacContainerId \
-	(tkIntPlatStubsPtr->tkMacContainerId) /* 63 */
-#endif
-#ifndef TkMacGetHostToplevel
-#define TkMacGetHostToplevel \
-	(tkIntPlatStubsPtr->tkMacGetHostToplevel) /* 64 */
-#endif
-#ifndef TkMacPreprocessMenu
-#define TkMacPreprocessMenu \
-	(tkIntPlatStubsPtr->tkMacPreprocessMenu) /* 65 */
-#endif
-#ifndef TkpIsWindowFloating
-#define TkpIsWindowFloating \
-	(tkIntPlatStubsPtr->tkpIsWindowFloating) /* 66 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkGenerateActivateEvents
 #define TkGenerateActivateEvents \
@@ -1230,7 +815,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkpGetMS) /* 53 */
 #endif
 #endif /* AQUA */
-#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
 #ifndef TkCreateXEventSource
 #define TkCreateXEventSource \
 	(tkIntPlatStubsPtr->tkCreateXEventSource) /* 0 */
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index fb2738f..b808233 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -385,296 +385,6 @@ EXTERN int		XSync _ANSI_ARGS_((Display *display, Bool discard));
 /* 114 */
 EXTERN VisualID		XVisualIDFromVisual _ANSI_ARGS_((Visual *visual));
 #endif /* WIN */
-#ifdef MAC_TCL
-/* 0 */
-EXTERN int		XSetDashes _ANSI_ARGS_((Display *display, GC gc,
-				int dash_offset, _Xconst char *dash_list,
-				int n));
-/* 1 */
-EXTERN XModifierKeymap * XGetModifierMapping _ANSI_ARGS_((Display *d));
-/* 2 */
-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));
-/* 3 */
-EXTERN XImage *		XGetImage _ANSI_ARGS_((Display *d, Drawable dr,
-				int i1, int i2, unsigned int ui1,
-				unsigned int ui2, unsigned long ul, int i3));
-/* 4 */
-EXTERN char *		XGetAtomName _ANSI_ARGS_((Display *d, Atom a));
-/* 5 */
-EXTERN char *		XKeysymToString _ANSI_ARGS_((KeySym k));
-/* 6 */
-EXTERN Colormap		XCreateColormap _ANSI_ARGS_((Display *d, Window w,
-				Visual *v, int i));
-/* 7 */
-EXTERN GContext		XGContextFromGC _ANSI_ARGS_((GC g));
-/* 8 */
-EXTERN KeySym		XKeycodeToKeysym _ANSI_ARGS_((Display *d, KeyCode k,
-				int i));
-/* 9 */
-EXTERN KeySym		XStringToKeysym _ANSI_ARGS_((_Xconst char *c));
-/* 10 */
-EXTERN Window		XRootWindow _ANSI_ARGS_((Display *d, int i));
-/* 11 */
-EXTERN XErrorHandler	XSetErrorHandler _ANSI_ARGS_((XErrorHandler x));
-/* 12 */
-EXTERN Status		XAllocColor _ANSI_ARGS_((Display *d, Colormap c,
-				XColor *xp));
-/* 13 */
-EXTERN int		XBell _ANSI_ARGS_((Display *d, int i));
-/* 14 */
-EXTERN void		XChangeProperty _ANSI_ARGS_((Display *d, Window w,
-				Atom a1, Atom a2, int i1, int i2,
-				_Xconst unsigned char *c, int i3));
-/* 15 */
-EXTERN void		XChangeWindowAttributes _ANSI_ARGS_((Display *d,
-				Window w, unsigned long ul,
-				XSetWindowAttributes *x));
-/* 16 */
-EXTERN void		XConfigureWindow _ANSI_ARGS_((Display *d, Window w,
-				unsigned int i, XWindowChanges *x));
-/* 17 */
-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));
-/* 18 */
-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));
-/* 19 */
-EXTERN Pixmap		XCreateBitmapFromData _ANSI_ARGS_((Display *display,
-				Drawable d, _Xconst char *data,
-				unsigned int width, unsigned int height));
-/* 20 */
-EXTERN int		XDefineCursor _ANSI_ARGS_((Display *d, Window w,
-				Cursor c));
-/* 21 */
-EXTERN void		XDestroyWindow _ANSI_ARGS_((Display *d, Window w));
-/* 22 */
-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));
-/* 23 */
-EXTERN int		XDrawLines _ANSI_ARGS_((Display *d, Drawable dr,
-				GC g, XPoint *x, int i1, int i2));
-/* 24 */
-EXTERN void		XDrawRectangle _ANSI_ARGS_((Display *d, Drawable dr,
-				GC g, int i1, int i2, unsigned int ui1,
-				unsigned int ui2));
-/* 25 */
-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));
-/* 26 */
-EXTERN void		XFillPolygon _ANSI_ARGS_((Display *d, Drawable dr,
-				GC g, XPoint *x, int i1, int i2, int i3));
-/* 27 */
-EXTERN int		XFillRectangles _ANSI_ARGS_((Display *d, Drawable dr,
-				GC g, XRectangle *x, int i));
-/* 28 */
-EXTERN int		XFreeColormap _ANSI_ARGS_((Display *d, Colormap c));
-/* 29 */
-EXTERN int		XFreeColors _ANSI_ARGS_((Display *d, Colormap c,
-				unsigned long *ulp, int i, unsigned long ul));
-/* 30 */
-EXTERN int		XFreeModifiermap _ANSI_ARGS_((XModifierKeymap *x));
-/* 31 */
-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));
-/* 32 */
-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));
-/* 33 */
-EXTERN int		XGrabKeyboard _ANSI_ARGS_((Display *d, Window w,
-				Bool b, int i1, int i2, Time t));
-/* 34 */
-EXTERN int		XGrabPointer _ANSI_ARGS_((Display *d, Window w1,
-				Bool b, unsigned int ui, int i1, int i2,
-				Window w2, Cursor c, Time t));
-/* 35 */
-EXTERN KeyCode		XKeysymToKeycode _ANSI_ARGS_((Display *d, KeySym k));
-/* 36 */
-EXTERN void		XMapWindow _ANSI_ARGS_((Display *d, Window w));
-/* 37 */
-EXTERN void		XMoveResizeWindow _ANSI_ARGS_((Display *d, Window w,
-				int i1, int i2, unsigned int ui1,
-				unsigned int ui2));
-/* 38 */
-EXTERN void		XMoveWindow _ANSI_ARGS_((Display *d, Window w,
-				int i1, int i2));
-/* 39 */
-EXTERN Bool		XQueryPointer _ANSI_ARGS_((Display *d, Window w1,
-				Window *w2, Window *w3, int *i1, int *i2,
-				int *i3, int *i4, unsigned int *ui));
-/* 40 */
-EXTERN void		XRaiseWindow _ANSI_ARGS_((Display *d, Window w));
-/* 41 */
-EXTERN void		XRefreshKeyboardMapping _ANSI_ARGS_((
-				XMappingEvent *x));
-/* 42 */
-EXTERN void		XResizeWindow _ANSI_ARGS_((Display *d, Window w,
-				unsigned int ui1, unsigned int ui2));
-/* 43 */
-EXTERN void		XSelectInput _ANSI_ARGS_((Display *d, Window w,
-				long l));
-/* 44 */
-EXTERN Status		XSendEvent _ANSI_ARGS_((Display *d, Window w, Bool b,
-				long l, XEvent *x));
-/* 45 */
-EXTERN void		XSetIconName _ANSI_ARGS_((Display *d, Window w,
-				_Xconst char *c));
-/* 46 */
-EXTERN void		XSetInputFocus _ANSI_ARGS_((Display *d, Window w,
-				int i, Time t));
-/* 47 */
-EXTERN int		XSetSelectionOwner _ANSI_ARGS_((Display *d, Atom a,
-				Window w, Time t));
-/* 48 */
-EXTERN void		XSetWindowBackground _ANSI_ARGS_((Display *d,
-				Window w, unsigned long ul));
-/* 49 */
-EXTERN void		XSetWindowBackgroundPixmap _ANSI_ARGS_((Display *d,
-				Window w, Pixmap p));
-/* 50 */
-EXTERN void		XSetWindowBorder _ANSI_ARGS_((Display *d, Window w,
-				unsigned long ul));
-/* 51 */
-EXTERN void		XSetWindowBorderPixmap _ANSI_ARGS_((Display *d,
-				Window w, Pixmap p));
-/* 52 */
-EXTERN void		XSetWindowBorderWidth _ANSI_ARGS_((Display *d,
-				Window w, unsigned int ui));
-/* 53 */
-EXTERN void		XSetWindowColormap _ANSI_ARGS_((Display *d, Window w,
-				Colormap c));
-/* 54 */
-EXTERN void		XUngrabKeyboard _ANSI_ARGS_((Display *d, Time t));
-/* 55 */
-EXTERN int		XUngrabPointer _ANSI_ARGS_((Display *d, Time t));
-/* 56 */
-EXTERN void		XUnmapWindow _ANSI_ARGS_((Display *d, Window w));
-/* 57 */
-EXTERN int		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));
-/* 58 */
-EXTERN Status		XParseColor _ANSI_ARGS_((Display *display,
-				Colormap map, _Xconst char *spec,
-				XColor *colorPtr));
-/* 59 */
-EXTERN GC		XCreateGC _ANSI_ARGS_((Display *display, Drawable d,
-				unsigned long valuemask, XGCValues *values));
-/* 60 */
-EXTERN int		XFreeGC _ANSI_ARGS_((Display *display, GC gc));
-/* 61 */
-EXTERN Atom		XInternAtom _ANSI_ARGS_((Display *display,
-				_Xconst char *atom_name, Bool only_if_exists));
-/* 62 */
-EXTERN int		XSetBackground _ANSI_ARGS_((Display *display, GC gc,
-				unsigned long foreground));
-/* 63 */
-EXTERN int		XSetForeground _ANSI_ARGS_((Display *display, GC gc,
-				unsigned long foreground));
-/* 64 */
-EXTERN int		XSetClipMask _ANSI_ARGS_((Display *display, GC gc,
-				Pixmap pixmap));
-/* 65 */
-EXTERN int		XSetClipOrigin _ANSI_ARGS_((Display *display, GC gc,
-				int clip_x_origin, int clip_y_origin));
-/* 66 */
-EXTERN int		XSetTSOrigin _ANSI_ARGS_((Display *display, GC gc,
-				int ts_x_origin, int ts_y_origin));
-/* 67 */
-EXTERN int		XChangeGC _ANSI_ARGS_((Display *d, GC gc,
-				unsigned long mask, XGCValues *values));
-/* 68 */
-EXTERN int		XSetFont _ANSI_ARGS_((Display *display, GC gc,
-				Font font));
-/* 69 */
-EXTERN int		XSetArcMode _ANSI_ARGS_((Display *display, GC gc,
-				int arc_mode));
-/* 70 */
-EXTERN int		XSetStipple _ANSI_ARGS_((Display *display, GC gc,
-				Pixmap stipple));
-/* 71 */
-EXTERN int		XSetFillRule _ANSI_ARGS_((Display *display, GC gc,
-				int fill_rule));
-/* 72 */
-EXTERN int		XSetFillStyle _ANSI_ARGS_((Display *display, GC gc,
-				int fill_style));
-/* 73 */
-EXTERN int		XSetFunction _ANSI_ARGS_((Display *display, GC gc,
-				int function));
-/* 74 */
-EXTERN int		XSetLineAttributes _ANSI_ARGS_((Display *display,
-				GC gc, unsigned int line_width,
-				int line_style, int cap_style,
-				int join_style));
-/* 75 */
-EXTERN int		_XInitImageFuncPtrs _ANSI_ARGS_((XImage *image));
-/* 76 */
-EXTERN XIC		XCreateIC _ANSI_ARGS_((void));
-/* 77 */
-EXTERN XVisualInfo *	XGetVisualInfo _ANSI_ARGS_((Display *display,
-				long vinfo_mask, XVisualInfo *vinfo_template,
-				int *nitems_return));
-/* 78 */
-EXTERN void		XSetWMClientMachine _ANSI_ARGS_((Display *display,
-				Window w, XTextProperty *text_prop));
-/* 79 */
-EXTERN Status		XStringListToTextProperty _ANSI_ARGS_((char **list,
-				int count, XTextProperty *text_prop_return));
-/* 80 */
-EXTERN void		XDrawSegments _ANSI_ARGS_((Display *display,
-				Drawable d, GC gc, XSegment *segments,
-				int nsegments));
-/* 81 */
-EXTERN void		XForceScreenSaver _ANSI_ARGS_((Display *display,
-				int mode));
-/* 82 */
-EXTERN int		XDrawLine _ANSI_ARGS_((Display *d, Drawable dr, GC g,
-				int x1, int y1, int x2, int y2));
-/* 83 */
-EXTERN int		XFillRectangle _ANSI_ARGS_((Display *display,
-				Drawable d, GC gc, int x, int y,
-				unsigned int width, unsigned int height));
-/* 84 */
-EXTERN void		XClearWindow _ANSI_ARGS_((Display *d, Window w));
-/* 85 */
-EXTERN void		XDrawPoint _ANSI_ARGS_((Display *display, Drawable d,
-				GC gc, int x, int y));
-/* 86 */
-EXTERN void		XDrawPoints _ANSI_ARGS_((Display *display,
-				Drawable d, GC gc, XPoint *points,
-				int npoints, int mode));
-/* 87 */
-EXTERN int		XWarpPointer _ANSI_ARGS_((Display *display,
-				Window src_w, Window dest_w, int src_x,
-				int src_y, unsigned int src_width,
-				unsigned int src_height, int dest_x,
-				int dest_y));
-/* 88 */
-EXTERN void		XQueryColor _ANSI_ARGS_((Display *display,
-				Colormap colormap, XColor *def_in_out));
-/* 89 */
-EXTERN void		XQueryColors _ANSI_ARGS_((Display *display,
-				Colormap colormap, XColor *defs_in_out,
-				int ncolors));
-/* 90 */
-EXTERN Status		XQueryTree _ANSI_ARGS_((Display *d, Window w1,
-				Window *w2, Window *w3, Window **w4,
-				unsigned int *ui));
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
 /* 0 */
 EXTERN int		XSetDashes _ANSI_ARGS_((Display *display, GC gc,
@@ -1089,99 +799,6 @@ typedef struct TkIntXlibStubs {
     int (*xSync) _ANSI_ARGS_((Display *display, Bool discard)); /* 113 */
     VisualID (*xVisualIDFromVisual) _ANSI_ARGS_((Visual *visual)); /* 114 */
 #endif /* WIN */
-#ifdef MAC_TCL
-    int (*xSetDashes) _ANSI_ARGS_((Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n)); /* 0 */
-    XModifierKeymap * (*xGetModifierMapping) _ANSI_ARGS_((Display *d)); /* 1 */
-    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)); /* 2 */
-    XImage * (*xGetImage) _ANSI_ARGS_((Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */
-    char * (*xGetAtomName) _ANSI_ARGS_((Display *d, Atom a)); /* 4 */
-    char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 5 */
-    Colormap (*xCreateColormap) _ANSI_ARGS_((Display *d, Window w, Visual *v, int i)); /* 6 */
-    GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 7 */
-    KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display *d, KeyCode k, int i)); /* 8 */
-    KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char *c)); /* 9 */
-    Window (*xRootWindow) _ANSI_ARGS_((Display *d, int i)); /* 10 */
-    XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 11 */
-    Status (*xAllocColor) _ANSI_ARGS_((Display *d, Colormap c, XColor *xp)); /* 12 */
-    int (*xBell) _ANSI_ARGS_((Display *d, int i)); /* 13 */
-    void (*xChangeProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3)); /* 14 */
-    void (*xChangeWindowAttributes) _ANSI_ARGS_((Display *d, Window w, unsigned long ul, XSetWindowAttributes *x)); /* 15 */
-    void (*xConfigureWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int i, XWindowChanges *x)); /* 16 */
-    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)); /* 17 */
-    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)); /* 18 */
-    Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height)); /* 19 */
-    int (*xDefineCursor) _ANSI_ARGS_((Display *d, Window w, Cursor c)); /* 20 */
-    void (*xDestroyWindow) _ANSI_ARGS_((Display *d, Window w)); /* 21 */
-    void (*xDrawArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */
-    int (*xDrawLines) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)); /* 23 */
-    void (*xDrawRectangle) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */
-    void (*xFillArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */
-    void (*xFillPolygon) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3)); /* 26 */
-    int (*xFillRectangles) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XRectangle *x, int i)); /* 27 */
-    int (*xFreeColormap) _ANSI_ARGS_((Display *d, Colormap c)); /* 28 */
-    int (*xFreeColors) _ANSI_ARGS_((Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul)); /* 29 */
-    int (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap *x)); /* 30 */
-    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)); /* 31 */
-    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)); /* 32 */
-    int (*xGrabKeyboard) _ANSI_ARGS_((Display *d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */
-    int (*xGrabPointer) _ANSI_ARGS_((Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */
-    KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display *d, KeySym k)); /* 35 */
-    void (*xMapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 36 */
-    void (*xMoveResizeWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */
-    void (*xMoveWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2)); /* 38 */
-    Bool (*xQueryPointer) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui)); /* 39 */
-    void (*xRaiseWindow) _ANSI_ARGS_((Display *d, Window w)); /* 40 */
-    void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent *x)); /* 41 */
-    void (*xResizeWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */
-    void (*xSelectInput) _ANSI_ARGS_((Display *d, Window w, long l)); /* 43 */
-    Status (*xSendEvent) _ANSI_ARGS_((Display *d, Window w, Bool b, long l, XEvent *x)); /* 44 */
-    void (*xSetIconName) _ANSI_ARGS_((Display *d, Window w, _Xconst char *c)); /* 45 */
-    void (*xSetInputFocus) _ANSI_ARGS_((Display *d, Window w, int i, Time t)); /* 46 */
-    int (*xSetSelectionOwner) _ANSI_ARGS_((Display *d, Atom a, Window w, Time t)); /* 47 */
-    void (*xSetWindowBackground) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 48 */
-    void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 49 */
-    void (*xSetWindowBorder) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 50 */
-    void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 51 */
-    void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display *d, Window w, unsigned int ui)); /* 52 */
-    void (*xSetWindowColormap) _ANSI_ARGS_((Display *d, Window w, Colormap c)); /* 53 */
-    void (*xUngrabKeyboard) _ANSI_ARGS_((Display *d, Time t)); /* 54 */
-    int (*xUngrabPointer) _ANSI_ARGS_((Display *d, Time t)); /* 55 */
-    void (*xUnmapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 56 */
-    int (*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)); /* 57 */
-    Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 58 */
-    GC (*xCreateGC) _ANSI_ARGS_((Display *display, Drawable d, unsigned long valuemask, XGCValues *values)); /* 59 */
-    int (*xFreeGC) _ANSI_ARGS_((Display *display, GC gc)); /* 60 */
-    Atom (*xInternAtom) _ANSI_ARGS_((Display *display, _Xconst char *atom_name, Bool only_if_exists)); /* 61 */
-    int (*xSetBackground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 62 */
-    int (*xSetForeground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 63 */
-    int (*xSetClipMask) _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 64 */
-    int (*xSetClipOrigin) _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */
-    int (*xSetTSOrigin) _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */
-    int (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 67 */
-    int (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 68 */
-    int (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 69 */
-    int (*xSetStipple) _ANSI_ARGS_((Display *display, GC gc, Pixmap stipple)); /* 70 */
-    int (*xSetFillRule) _ANSI_ARGS_((Display *display, GC gc, int fill_rule)); /* 71 */
-    int (*xSetFillStyle) _ANSI_ARGS_((Display *display, GC gc, int fill_style)); /* 72 */
-    int (*xSetFunction) _ANSI_ARGS_((Display *display, GC gc, int function)); /* 73 */
-    int (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */
-    int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage *image)); /* 75 */
-    XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 76 */
-    XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return)); /* 77 */
-    void (*xSetWMClientMachine) _ANSI_ARGS_((Display *display, Window w, XTextProperty *text_prop)); /* 78 */
-    Status (*xStringListToTextProperty) _ANSI_ARGS_((char **list, int count, XTextProperty *text_prop_return)); /* 79 */
-    void (*xDrawSegments) _ANSI_ARGS_((Display *display, Drawable d, GC gc, XSegment *segments, int nsegments)); /* 80 */
-    void (*xForceScreenSaver) _ANSI_ARGS_((Display *display, int mode)); /* 81 */
-    int (*xDrawLine) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */
-    int (*xFillRectangle) _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */
-    void (*xClearWindow) _ANSI_ARGS_((Display *d, Window w)); /* 84 */
-    void (*xDrawPoint) _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y)); /* 85 */
-    void (*xDrawPoints) _ANSI_ARGS_((Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode)); /* 86 */
-    int (*xWarpPointer) _ANSI_ARGS_((Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */
-    void (*xQueryColor) _ANSI_ARGS_((Display *display, Colormap colormap, XColor *def_in_out)); /* 88 */
-    void (*xQueryColors) _ANSI_ARGS_((Display *display, Colormap colormap, XColor *defs_in_out, int ncolors)); /* 89 */
-    Status (*xQueryTree) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui)); /* 90 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
     int (*xSetDashes) _ANSI_ARGS_((Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n)); /* 0 */
     XModifierKeymap * (*xGetModifierMapping) _ANSI_ARGS_((Display *d)); /* 1 */
@@ -1751,372 +1368,6 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 	(tkIntXlibStubsPtr->xVisualIDFromVisual) /* 114 */
 #endif
 #endif /* WIN */
-#ifdef MAC_TCL
-#ifndef XSetDashes
-#define XSetDashes \
-	(tkIntXlibStubsPtr->xSetDashes) /* 0 */
-#endif
-#ifndef XGetModifierMapping
-#define XGetModifierMapping \
-	(tkIntXlibStubsPtr->xGetModifierMapping) /* 1 */
-#endif
-#ifndef XCreateImage
-#define XCreateImage \
-	(tkIntXlibStubsPtr->xCreateImage) /* 2 */
-#endif
-#ifndef XGetImage
-#define XGetImage \
-	(tkIntXlibStubsPtr->xGetImage) /* 3 */
-#endif
-#ifndef XGetAtomName
-#define XGetAtomName \
-	(tkIntXlibStubsPtr->xGetAtomName) /* 4 */
-#endif
-#ifndef XKeysymToString
-#define XKeysymToString \
-	(tkIntXlibStubsPtr->xKeysymToString) /* 5 */
-#endif
-#ifndef XCreateColormap
-#define XCreateColormap \
-	(tkIntXlibStubsPtr->xCreateColormap) /* 6 */
-#endif
-#ifndef XGContextFromGC
-#define XGContextFromGC \
-	(tkIntXlibStubsPtr->xGContextFromGC) /* 7 */
-#endif
-#ifndef XKeycodeToKeysym
-#define XKeycodeToKeysym \
-	(tkIntXlibStubsPtr->xKeycodeToKeysym) /* 8 */
-#endif
-#ifndef XStringToKeysym
-#define XStringToKeysym \
-	(tkIntXlibStubsPtr->xStringToKeysym) /* 9 */
-#endif
-#ifndef XRootWindow
-#define XRootWindow \
-	(tkIntXlibStubsPtr->xRootWindow) /* 10 */
-#endif
-#ifndef XSetErrorHandler
-#define XSetErrorHandler \
-	(tkIntXlibStubsPtr->xSetErrorHandler) /* 11 */
-#endif
-#ifndef XAllocColor
-#define XAllocColor \
-	(tkIntXlibStubsPtr->xAllocColor) /* 12 */
-#endif
-#ifndef XBell
-#define XBell \
-	(tkIntXlibStubsPtr->xBell) /* 13 */
-#endif
-#ifndef XChangeProperty
-#define XChangeProperty \
-	(tkIntXlibStubsPtr->xChangeProperty) /* 14 */
-#endif
-#ifndef XChangeWindowAttributes
-#define XChangeWindowAttributes \
-	(tkIntXlibStubsPtr->xChangeWindowAttributes) /* 15 */
-#endif
-#ifndef XConfigureWindow
-#define XConfigureWindow \
-	(tkIntXlibStubsPtr->xConfigureWindow) /* 16 */
-#endif
-#ifndef XCopyArea
-#define XCopyArea \
-	(tkIntXlibStubsPtr->xCopyArea) /* 17 */
-#endif
-#ifndef XCopyPlane
-#define XCopyPlane \
-	(tkIntXlibStubsPtr->xCopyPlane) /* 18 */
-#endif
-#ifndef XCreateBitmapFromData
-#define XCreateBitmapFromData \
-	(tkIntXlibStubsPtr->xCreateBitmapFromData) /* 19 */
-#endif
-#ifndef XDefineCursor
-#define XDefineCursor \
-	(tkIntXlibStubsPtr->xDefineCursor) /* 20 */
-#endif
-#ifndef XDestroyWindow
-#define XDestroyWindow \
-	(tkIntXlibStubsPtr->xDestroyWindow) /* 21 */
-#endif
-#ifndef XDrawArc
-#define XDrawArc \
-	(tkIntXlibStubsPtr->xDrawArc) /* 22 */
-#endif
-#ifndef XDrawLines
-#define XDrawLines \
-	(tkIntXlibStubsPtr->xDrawLines) /* 23 */
-#endif
-#ifndef XDrawRectangle
-#define XDrawRectangle \
-	(tkIntXlibStubsPtr->xDrawRectangle) /* 24 */
-#endif
-#ifndef XFillArc
-#define XFillArc \
-	(tkIntXlibStubsPtr->xFillArc) /* 25 */
-#endif
-#ifndef XFillPolygon
-#define XFillPolygon \
-	(tkIntXlibStubsPtr->xFillPolygon) /* 26 */
-#endif
-#ifndef XFillRectangles
-#define XFillRectangles \
-	(tkIntXlibStubsPtr->xFillRectangles) /* 27 */
-#endif
-#ifndef XFreeColormap
-#define XFreeColormap \
-	(tkIntXlibStubsPtr->xFreeColormap) /* 28 */
-#endif
-#ifndef XFreeColors
-#define XFreeColors \
-	(tkIntXlibStubsPtr->xFreeColors) /* 29 */
-#endif
-#ifndef XFreeModifiermap
-#define XFreeModifiermap \
-	(tkIntXlibStubsPtr->xFreeModifiermap) /* 30 */
-#endif
-#ifndef XGetGeometry
-#define XGetGeometry \
-	(tkIntXlibStubsPtr->xGetGeometry) /* 31 */
-#endif
-#ifndef XGetWindowProperty
-#define XGetWindowProperty \
-	(tkIntXlibStubsPtr->xGetWindowProperty) /* 32 */
-#endif
-#ifndef XGrabKeyboard
-#define XGrabKeyboard \
-	(tkIntXlibStubsPtr->xGrabKeyboard) /* 33 */
-#endif
-#ifndef XGrabPointer
-#define XGrabPointer \
-	(tkIntXlibStubsPtr->xGrabPointer) /* 34 */
-#endif
-#ifndef XKeysymToKeycode
-#define XKeysymToKeycode \
-	(tkIntXlibStubsPtr->xKeysymToKeycode) /* 35 */
-#endif
-#ifndef XMapWindow
-#define XMapWindow \
-	(tkIntXlibStubsPtr->xMapWindow) /* 36 */
-#endif
-#ifndef XMoveResizeWindow
-#define XMoveResizeWindow \
-	(tkIntXlibStubsPtr->xMoveResizeWindow) /* 37 */
-#endif
-#ifndef XMoveWindow
-#define XMoveWindow \
-	(tkIntXlibStubsPtr->xMoveWindow) /* 38 */
-#endif
-#ifndef XQueryPointer
-#define XQueryPointer \
-	(tkIntXlibStubsPtr->xQueryPointer) /* 39 */
-#endif
-#ifndef XRaiseWindow
-#define XRaiseWindow \
-	(tkIntXlibStubsPtr->xRaiseWindow) /* 40 */
-#endif
-#ifndef XRefreshKeyboardMapping
-#define XRefreshKeyboardMapping \
-	(tkIntXlibStubsPtr->xRefreshKeyboardMapping) /* 41 */
-#endif
-#ifndef XResizeWindow
-#define XResizeWindow \
-	(tkIntXlibStubsPtr->xResizeWindow) /* 42 */
-#endif
-#ifndef XSelectInput
-#define XSelectInput \
-	(tkIntXlibStubsPtr->xSelectInput) /* 43 */
-#endif
-#ifndef XSendEvent
-#define XSendEvent \
-	(tkIntXlibStubsPtr->xSendEvent) /* 44 */
-#endif
-#ifndef XSetIconName
-#define XSetIconName \
-	(tkIntXlibStubsPtr->xSetIconName) /* 45 */
-#endif
-#ifndef XSetInputFocus
-#define XSetInputFocus \
-	(tkIntXlibStubsPtr->xSetInputFocus) /* 46 */
-#endif
-#ifndef XSetSelectionOwner
-#define XSetSelectionOwner \
-	(tkIntXlibStubsPtr->xSetSelectionOwner) /* 47 */
-#endif
-#ifndef XSetWindowBackground
-#define XSetWindowBackground \
-	(tkIntXlibStubsPtr->xSetWindowBackground) /* 48 */
-#endif
-#ifndef XSetWindowBackgroundPixmap
-#define XSetWindowBackgroundPixmap \
-	(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap) /* 49 */
-#endif
-#ifndef XSetWindowBorder
-#define XSetWindowBorder \
-	(tkIntXlibStubsPtr->xSetWindowBorder) /* 50 */
-#endif
-#ifndef XSetWindowBorderPixmap
-#define XSetWindowBorderPixmap \
-	(tkIntXlibStubsPtr->xSetWindowBorderPixmap) /* 51 */
-#endif
-#ifndef XSetWindowBorderWidth
-#define XSetWindowBorderWidth \
-	(tkIntXlibStubsPtr->xSetWindowBorderWidth) /* 52 */
-#endif
-#ifndef XSetWindowColormap
-#define XSetWindowColormap \
-	(tkIntXlibStubsPtr->xSetWindowColormap) /* 53 */
-#endif
-#ifndef XUngrabKeyboard
-#define XUngrabKeyboard \
-	(tkIntXlibStubsPtr->xUngrabKeyboard) /* 54 */
-#endif
-#ifndef XUngrabPointer
-#define XUngrabPointer \
-	(tkIntXlibStubsPtr->xUngrabPointer) /* 55 */
-#endif
-#ifndef XUnmapWindow
-#define XUnmapWindow \
-	(tkIntXlibStubsPtr->xUnmapWindow) /* 56 */
-#endif
-#ifndef TkPutImage
-#define TkPutImage \
-	(tkIntXlibStubsPtr->tkPutImage) /* 57 */
-#endif
-#ifndef XParseColor
-#define XParseColor \
-	(tkIntXlibStubsPtr->xParseColor) /* 58 */
-#endif
-#ifndef XCreateGC
-#define XCreateGC \
-	(tkIntXlibStubsPtr->xCreateGC) /* 59 */
-#endif
-#ifndef XFreeGC
-#define XFreeGC \
-	(tkIntXlibStubsPtr->xFreeGC) /* 60 */
-#endif
-#ifndef XInternAtom
-#define XInternAtom \
-	(tkIntXlibStubsPtr->xInternAtom) /* 61 */
-#endif
-#ifndef XSetBackground
-#define XSetBackground \
-	(tkIntXlibStubsPtr->xSetBackground) /* 62 */
-#endif
-#ifndef XSetForeground
-#define XSetForeground \
-	(tkIntXlibStubsPtr->xSetForeground) /* 63 */
-#endif
-#ifndef XSetClipMask
-#define XSetClipMask \
-	(tkIntXlibStubsPtr->xSetClipMask) /* 64 */
-#endif
-#ifndef XSetClipOrigin
-#define XSetClipOrigin \
-	(tkIntXlibStubsPtr->xSetClipOrigin) /* 65 */
-#endif
-#ifndef XSetTSOrigin
-#define XSetTSOrigin \
-	(tkIntXlibStubsPtr->xSetTSOrigin) /* 66 */
-#endif
-#ifndef XChangeGC
-#define XChangeGC \
-	(tkIntXlibStubsPtr->xChangeGC) /* 67 */
-#endif
-#ifndef XSetFont
-#define XSetFont \
-	(tkIntXlibStubsPtr->xSetFont) /* 68 */
-#endif
-#ifndef XSetArcMode
-#define XSetArcMode \
-	(tkIntXlibStubsPtr->xSetArcMode) /* 69 */
-#endif
-#ifndef XSetStipple
-#define XSetStipple \
-	(tkIntXlibStubsPtr->xSetStipple) /* 70 */
-#endif
-#ifndef XSetFillRule
-#define XSetFillRule \
-	(tkIntXlibStubsPtr->xSetFillRule) /* 71 */
-#endif
-#ifndef XSetFillStyle
-#define XSetFillStyle \
-	(tkIntXlibStubsPtr->xSetFillStyle) /* 72 */
-#endif
-#ifndef XSetFunction
-#define XSetFunction \
-	(tkIntXlibStubsPtr->xSetFunction) /* 73 */
-#endif
-#ifndef XSetLineAttributes
-#define XSetLineAttributes \
-	(tkIntXlibStubsPtr->xSetLineAttributes) /* 74 */
-#endif
-#ifndef _XInitImageFuncPtrs
-#define _XInitImageFuncPtrs \
-	(tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 75 */
-#endif
-#ifndef XCreateIC
-#define XCreateIC \
-	(tkIntXlibStubsPtr->xCreateIC) /* 76 */
-#endif
-#ifndef XGetVisualInfo
-#define XGetVisualInfo \
-	(tkIntXlibStubsPtr->xGetVisualInfo) /* 77 */
-#endif
-#ifndef XSetWMClientMachine
-#define XSetWMClientMachine \
-	(tkIntXlibStubsPtr->xSetWMClientMachine) /* 78 */
-#endif
-#ifndef XStringListToTextProperty
-#define XStringListToTextProperty \
-	(tkIntXlibStubsPtr->xStringListToTextProperty) /* 79 */
-#endif
-#ifndef XDrawSegments
-#define XDrawSegments \
-	(tkIntXlibStubsPtr->xDrawSegments) /* 80 */
-#endif
-#ifndef XForceScreenSaver
-#define XForceScreenSaver \
-	(tkIntXlibStubsPtr->xForceScreenSaver) /* 81 */
-#endif
-#ifndef XDrawLine
-#define XDrawLine \
-	(tkIntXlibStubsPtr->xDrawLine) /* 82 */
-#endif
-#ifndef XFillRectangle
-#define XFillRectangle \
-	(tkIntXlibStubsPtr->xFillRectangle) /* 83 */
-#endif
-#ifndef XClearWindow
-#define XClearWindow \
-	(tkIntXlibStubsPtr->xClearWindow) /* 84 */
-#endif
-#ifndef XDrawPoint
-#define XDrawPoint \
-	(tkIntXlibStubsPtr->xDrawPoint) /* 85 */
-#endif
-#ifndef XDrawPoints
-#define XDrawPoints \
-	(tkIntXlibStubsPtr->xDrawPoints) /* 86 */
-#endif
-#ifndef XWarpPointer
-#define XWarpPointer \
-	(tkIntXlibStubsPtr->xWarpPointer) /* 87 */
-#endif
-#ifndef XQueryColor
-#define XQueryColor \
-	(tkIntXlibStubsPtr->xQueryColor) /* 88 */
-#endif
-#ifndef XQueryColors
-#define XQueryColors \
-	(tkIntXlibStubsPtr->xQueryColors) /* 89 */
-#endif
-#ifndef XQueryTree
-#define XQueryTree \
-	(tkIntXlibStubsPtr->xQueryTree) /* 90 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
 #ifndef XSetDashes
 #define XSetDashes \
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 3d08790..509b4f5 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -46,38 +46,6 @@ EXTERN int		Tk_TranslateWinEvent _ANSI_ARGS_((HWND hwnd,
 				UINT message, WPARAM wParam, LPARAM lParam,
 				LRESULT *result));
 #endif /* WIN */
-#ifdef MAC_TCL
-/* 0 */
-EXTERN void		Tk_MacSetEmbedHandler _ANSI_ARGS_((
-				Tk_MacEmbedRegisterWinProc *registerWinProcPtr,
-				Tk_MacEmbedGetGrafPortProc *getPortProcPtr,
-				Tk_MacEmbedMakeContainerExistProc *containerExistProcPtr,
-				Tk_MacEmbedGetClipProc *getClipProc,
-				Tk_MacEmbedGetOffsetInParentProc *getOffsetProc));
-/* 1 */
-EXTERN void		Tk_MacTurnOffMenus _ANSI_ARGS_((void));
-/* 2 */
-EXTERN void		Tk_MacTkOwnsCursor _ANSI_ARGS_((int tkOwnsIt));
-/* 3 */
-EXTERN void		TkMacInitMenus _ANSI_ARGS_((Tcl_Interp *interp));
-/* 4 */
-EXTERN void		TkMacInitAppleEvents _ANSI_ARGS_((Tcl_Interp *interp));
-/* 5 */
-EXTERN int		TkMacConvertEvent _ANSI_ARGS_((EventRecord *eventPtr));
-/* 6 */
-EXTERN int		TkMacConvertTkEvent _ANSI_ARGS_((
-				EventRecord *eventPtr, Window window));
-/* 7 */
-EXTERN void		TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin,
-				int x, int y, int width, int height,
-				int flags));
-/* 8 */
-EXTERN void		TkMacInvalClipRgns _ANSI_ARGS_((TkWindow *winPtr));
-/* 9 */
-EXTERN int		TkMacHaveAppearance _ANSI_ARGS_((void));
-/* 10 */
-EXTERN GWorldPtr	TkMacGetDrawablePort _ANSI_ARGS_((Drawable drawable));
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
 /* 0 */
 EXTERN void		Tk_MacOSXSetEmbedHandler _ANSI_ARGS_((
@@ -125,19 +93,6 @@ typedef struct TkPlatStubs {
     void (*tk_PointerEvent) _ANSI_ARGS_((HWND hwnd, int x, int y)); /* 4 */
     int (*tk_TranslateWinEvent) _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result)); /* 5 */
 #endif /* WIN */
-#ifdef MAC_TCL
-    void (*tk_MacSetEmbedHandler) _ANSI_ARGS_((Tk_MacEmbedRegisterWinProc *registerWinProcPtr, Tk_MacEmbedGetGrafPortProc *getPortProcPtr, Tk_MacEmbedMakeContainerExistProc *containerExistProcPtr, Tk_MacEmbedGetClipProc *getClipProc, Tk_MacEmbedGetOffsetInParentProc *getOffsetProc)); /* 0 */
-    void (*tk_MacTurnOffMenus) _ANSI_ARGS_((void)); /* 1 */
-    void (*tk_MacTkOwnsCursor) _ANSI_ARGS_((int tkOwnsIt)); /* 2 */
-    void (*tkMacInitMenus) _ANSI_ARGS_((Tcl_Interp *interp)); /* 3 */
-    void (*tkMacInitAppleEvents) _ANSI_ARGS_((Tcl_Interp *interp)); /* 4 */
-    int (*tkMacConvertEvent) _ANSI_ARGS_((EventRecord *eventPtr)); /* 5 */
-    int (*tkMacConvertTkEvent) _ANSI_ARGS_((EventRecord *eventPtr, Window window)); /* 6 */
-    void (*tkGenWMConfigureEvent) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 7 */
-    void (*tkMacInvalClipRgns) _ANSI_ARGS_((TkWindow *winPtr)); /* 8 */
-    int (*tkMacHaveAppearance) _ANSI_ARGS_((void)); /* 9 */
-    GWorldPtr (*tkMacGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 10 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
     void (*tk_MacOSXSetEmbedHandler) _ANSI_ARGS_((Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, Tk_MacOSXEmbedGetClipProc *getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc)); /* 0 */
     void (*tk_MacOSXTurnOffMenus) _ANSI_ARGS_((void)); /* 1 */
@@ -193,52 +148,6 @@ extern TkPlatStubs *tkPlatStubsPtr;
 	(tkPlatStubsPtr->tk_TranslateWinEvent) /* 5 */
 #endif
 #endif /* WIN */
-#ifdef MAC_TCL
-#ifndef Tk_MacSetEmbedHandler
-#define Tk_MacSetEmbedHandler \
-	(tkPlatStubsPtr->tk_MacSetEmbedHandler) /* 0 */
-#endif
-#ifndef Tk_MacTurnOffMenus
-#define Tk_MacTurnOffMenus \
-	(tkPlatStubsPtr->tk_MacTurnOffMenus) /* 1 */
-#endif
-#ifndef Tk_MacTkOwnsCursor
-#define Tk_MacTkOwnsCursor \
-	(tkPlatStubsPtr->tk_MacTkOwnsCursor) /* 2 */
-#endif
-#ifndef TkMacInitMenus
-#define TkMacInitMenus \
-	(tkPlatStubsPtr->tkMacInitMenus) /* 3 */
-#endif
-#ifndef TkMacInitAppleEvents
-#define TkMacInitAppleEvents \
-	(tkPlatStubsPtr->tkMacInitAppleEvents) /* 4 */
-#endif
-#ifndef TkMacConvertEvent
-#define TkMacConvertEvent \
-	(tkPlatStubsPtr->tkMacConvertEvent) /* 5 */
-#endif
-#ifndef TkMacConvertTkEvent
-#define TkMacConvertTkEvent \
-	(tkPlatStubsPtr->tkMacConvertTkEvent) /* 6 */
-#endif
-#ifndef TkGenWMConfigureEvent
-#define TkGenWMConfigureEvent \
-	(tkPlatStubsPtr->tkGenWMConfigureEvent) /* 7 */
-#endif
-#ifndef TkMacInvalClipRgns
-#define TkMacInvalClipRgns \
-	(tkPlatStubsPtr->tkMacInvalClipRgns) /* 8 */
-#endif
-#ifndef TkMacHaveAppearance
-#define TkMacHaveAppearance \
-	(tkPlatStubsPtr->tkMacHaveAppearance) /* 9 */
-#endif
-#ifndef TkMacGetDrawablePort
-#define TkMacGetDrawablePort \
-	(tkPlatStubsPtr->tkMacGetDrawablePort) /* 10 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
 #ifndef Tk_MacOSXSetEmbedHandler
 #define Tk_MacOSXSetEmbedHandler \
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index b9198d0..77f5379 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -395,41 +395,35 @@ TkIntStubs tkIntStubs = {
     TkSetRegion, /* 118 */
     TkUnionRectWithRegion, /* 119 */
     NULL, /* 120 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     NULL, /* 121 */
-#endif /* UNIX */
+#endif /* X11 */
 #if defined(__WIN32__) /* WIN */
     NULL, /* 121 */
 #endif /* WIN */
-#ifdef MAC_TCL
-    TkpCreateNativeBitmap, /* 121 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
+    NULL, /* 121 */ /* Dummy entry for stubs table backwards compatibility */
     TkpCreateNativeBitmap, /* 121 */
 #endif /* AQUA */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     NULL, /* 122 */
-#endif /* UNIX */
+#endif /* X11 */
 #if defined(__WIN32__) /* WIN */
     NULL, /* 122 */
 #endif /* WIN */
-#ifdef MAC_TCL
-    TkpDefineNativeBitmaps, /* 122 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
+    NULL, /* 122 */ /* Dummy entry for stubs table backwards compatibility */
     TkpDefineNativeBitmaps, /* 122 */
 #endif /* AQUA */
     NULL, /* 123 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     NULL, /* 124 */
-#endif /* UNIX */
+#endif /* X11 */
 #if defined(__WIN32__) /* WIN */
     NULL, /* 124 */
 #endif /* WIN */
-#ifdef MAC_TCL
-    TkpGetNativeAppBitmap, /* 124 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
+    NULL, /* 124 */ /* Dummy entry for stubs table backwards compatibility */
     TkpGetNativeAppBitmap, /* 124 */
 #endif /* AQUA */
     NULL, /* 125 */
@@ -512,75 +506,6 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkWmCleanup, /* 43 */
     TkSendCleanup, /* 44 */
 #endif /* WIN */
-#ifdef MAC_TCL
-    TkGenerateActivateEvents, /* 0 */
-    NULL, /* 1 */
-    NULL, /* 2 */
-    TkpGetMS, /* 3 */
-    NULL, /* 4 */
-    TkPointerDeadWindow, /* 5 */
-    TkpSetCapture, /* 6 */
-    TkpSetCursor, /* 7 */
-    TkpWmSetState, /* 8 */
-    NULL, /* 9 */
-    TkAboutDlg, /* 10 */
-    NULL, /* 11 */
-    NULL, /* 12 */
-    TkGetTransientMaster, /* 13 */
-    TkGenerateButtonEvent, /* 14 */
-    NULL, /* 15 */
-    TkGenWMDestroyEvent, /* 16 */
-    NULL, /* 17 */
-    TkMacButtonKeyState, /* 18 */
-    TkMacClearMenubarActive, /* 19 */
-    NULL, /* 20 */
-    TkMacDispatchMenuEvent, /* 21 */
-    TkMacInstallCursor, /* 22 */
-    NULL, /* 23 */
-    TkMacHandleTearoffMenu, /* 24 */
-    NULL, /* 25 */
-    NULL, /* 26 */
-    TkMacDoHLEvent, /* 27 */
-    NULL, /* 28 */
-    TkMacGenerateTime, /* 29 */
-    NULL, /* 30 */
-    TkMacGetScrollbarGrowWindow, /* 31 */
-    TkMacGetXWindow, /* 32 */
-    TkMacGrowToplevel, /* 33 */
-    TkMacHandleMenuSelect, /* 34 */
-    NULL, /* 35 */
-    NULL, /* 36 */
-    NULL, /* 37 */
-    TkMacInvalidateWindow, /* 38 */
-    TkMacIsCharacterMissing, /* 39 */
-    TkMacMakeRealWindowExist, /* 40 */
-    TkMacMakeStippleMap, /* 41 */
-    TkMacMenuClick, /* 42 */
-    TkMacRegisterOffScreenWindow, /* 43 */
-    TkMacResizable, /* 44 */
-    NULL, /* 45 */
-    TkMacSetHelpMenuItemCount, /* 46 */
-    TkMacSetScrollbarGrow, /* 47 */
-    TkMacSetUpClippingRgn, /* 48 */
-    TkMacSetUpGraphicsPort, /* 49 */
-    TkMacUpdateClipRgn, /* 50 */
-    TkMacUnregisterMacWindow, /* 51 */
-    TkMacUseMenuID, /* 52 */
-    TkMacVisableClipRgn, /* 53 */
-    TkMacWinBounds, /* 54 */
-    TkMacWindowOffset, /* 55 */
-    NULL, /* 56 */
-    TkSetMacColor, /* 57 */
-    TkSetWMName, /* 58 */
-    TkSuspendClipboard, /* 59 */
-    NULL, /* 60 */
-    TkMacZoomToplevel, /* 61 */
-    Tk_TopCoordsToWindow, /* 62 */
-    TkMacContainerId, /* 63 */
-    TkMacGetHostToplevel, /* 64 */
-    TkMacPreprocessMenu, /* 65 */
-    TkpIsWindowFloating, /* 66 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
     TkGenerateActivateEvents, /* 0 */
     NULL, /* 1 */
@@ -637,7 +562,7 @@ TkIntPlatStubs tkIntPlatStubs = {
     NULL, /* 52 */
     TkpGetMS, /* 53 */
 #endif /* AQUA */
-#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
     TkCreateXEventSource, /* 0 */
     TkFreeWindowId, /* 1 */
     TkInitXId, /* 2 */
@@ -774,99 +699,6 @@ TkIntXlibStubs tkIntXlibStubs = {
     XSync, /* 113 */
     XVisualIDFromVisual, /* 114 */
 #endif /* WIN */
-#ifdef MAC_TCL
-    XSetDashes, /* 0 */
-    XGetModifierMapping, /* 1 */
-    XCreateImage, /* 2 */
-    XGetImage, /* 3 */
-    XGetAtomName, /* 4 */
-    XKeysymToString, /* 5 */
-    XCreateColormap, /* 6 */
-    XGContextFromGC, /* 7 */
-    XKeycodeToKeysym, /* 8 */
-    XStringToKeysym, /* 9 */
-    XRootWindow, /* 10 */
-    XSetErrorHandler, /* 11 */
-    XAllocColor, /* 12 */
-    XBell, /* 13 */
-    XChangeProperty, /* 14 */
-    XChangeWindowAttributes, /* 15 */
-    XConfigureWindow, /* 16 */
-    XCopyArea, /* 17 */
-    XCopyPlane, /* 18 */
-    XCreateBitmapFromData, /* 19 */
-    XDefineCursor, /* 20 */
-    XDestroyWindow, /* 21 */
-    XDrawArc, /* 22 */
-    XDrawLines, /* 23 */
-    XDrawRectangle, /* 24 */
-    XFillArc, /* 25 */
-    XFillPolygon, /* 26 */
-    XFillRectangles, /* 27 */
-    XFreeColormap, /* 28 */
-    XFreeColors, /* 29 */
-    XFreeModifiermap, /* 30 */
-    XGetGeometry, /* 31 */
-    XGetWindowProperty, /* 32 */
-    XGrabKeyboard, /* 33 */
-    XGrabPointer, /* 34 */
-    XKeysymToKeycode, /* 35 */
-    XMapWindow, /* 36 */
-    XMoveResizeWindow, /* 37 */
-    XMoveWindow, /* 38 */
-    XQueryPointer, /* 39 */
-    XRaiseWindow, /* 40 */
-    XRefreshKeyboardMapping, /* 41 */
-    XResizeWindow, /* 42 */
-    XSelectInput, /* 43 */
-    XSendEvent, /* 44 */
-    XSetIconName, /* 45 */
-    XSetInputFocus, /* 46 */
-    XSetSelectionOwner, /* 47 */
-    XSetWindowBackground, /* 48 */
-    XSetWindowBackgroundPixmap, /* 49 */
-    XSetWindowBorder, /* 50 */
-    XSetWindowBorderPixmap, /* 51 */
-    XSetWindowBorderWidth, /* 52 */
-    XSetWindowColormap, /* 53 */
-    XUngrabKeyboard, /* 54 */
-    XUngrabPointer, /* 55 */
-    XUnmapWindow, /* 56 */
-    TkPutImage, /* 57 */
-    XParseColor, /* 58 */
-    XCreateGC, /* 59 */
-    XFreeGC, /* 60 */
-    XInternAtom, /* 61 */
-    XSetBackground, /* 62 */
-    XSetForeground, /* 63 */
-    XSetClipMask, /* 64 */
-    XSetClipOrigin, /* 65 */
-    XSetTSOrigin, /* 66 */
-    XChangeGC, /* 67 */
-    XSetFont, /* 68 */
-    XSetArcMode, /* 69 */
-    XSetStipple, /* 70 */
-    XSetFillRule, /* 71 */
-    XSetFillStyle, /* 72 */
-    XSetFunction, /* 73 */
-    XSetLineAttributes, /* 74 */
-    _XInitImageFuncPtrs, /* 75 */
-    XCreateIC, /* 76 */
-    XGetVisualInfo, /* 77 */
-    XSetWMClientMachine, /* 78 */
-    XStringListToTextProperty, /* 79 */
-    XDrawSegments, /* 80 */
-    XForceScreenSaver, /* 81 */
-    XDrawLine, /* 82 */
-    XFillRectangle, /* 83 */
-    XClearWindow, /* 84 */
-    XDrawPoint, /* 85 */
-    XDrawPoints, /* 86 */
-    XWarpPointer, /* 87 */
-    XQueryColor, /* 88 */
-    XQueryColors, /* 89 */
-    XQueryTree, /* 90 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
     XSetDashes, /* 0 */
     XGetModifierMapping, /* 1 */
@@ -974,19 +806,6 @@ TkPlatStubs tkPlatStubs = {
     Tk_PointerEvent, /* 4 */
     Tk_TranslateWinEvent, /* 5 */
 #endif /* WIN */
-#ifdef MAC_TCL
-    Tk_MacSetEmbedHandler, /* 0 */
-    Tk_MacTurnOffMenus, /* 1 */
-    Tk_MacTkOwnsCursor, /* 2 */
-    TkMacInitMenus, /* 3 */
-    TkMacInitAppleEvents, /* 4 */
-    TkMacConvertEvent, /* 5 */
-    TkMacConvertTkEvent, /* 6 */
-    TkGenWMConfigureEvent, /* 7 */
-    TkMacInvalClipRgns, /* 8 */
-    TkMacHaveAppearance, /* 9 */
-    TkMacGetDrawablePort, /* 10 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK /* AQUA */
     Tk_MacOSXSetEmbedHandler, /* 0 */
     Tk_MacOSXTurnOffMenus, /* 1 */