Backout part of [c9a672c28cc8]: joining X11 tables gives symbol conflicts on Linux

1 files changed, 658 insertions, 155 deletions

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index bf5e4ed..fbbab54 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -655,9 +655,6 @@ declare 41 x11 {
 declare 42 x11 {
     void TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar)
 }
-declare 43 x11 {
-    void TkWmCleanup(TkDisplay *dispPtr)
-}
 declare 44 x11 {
     void TkSendCleanup(TkDisplay *dispPtr)
 }
@@ -698,11 +695,14 @@ declare 8 win {
     void TkpSetCursor(TkpCursor cursor)
 }
 declare 9 win {
-    void TkpSetCapture(TkWindow *winPtr)
+    void TkWmCleanup(TkDisplay *dispPtr)
 }
 declare 10 win {
     void TkSetPixmapColormap(Pixmap pixmap, Colormap colormap)
 }
+declare 11 win {
+    void TkpSetCapture(TkWindow *winPtr)
+}
 declare 12 win {
     void TkWinClipboardRender(TkDisplay *dispPtr, UINT format)
 }
@@ -809,9 +809,6 @@ declare 41 win {
 declare 42 win {
     void TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar)
 }
-declare 43 win {
-    void TkWmCleanup(TkDisplay *dispPtr)
-}
 declare 44 win {
     void TkSendCleanup(TkDisplay *dispPtr)
 }
@@ -852,13 +849,13 @@ declare 8 aqua {
     unsigned int TkMacOSXButtonKeyState(void)
 }
 declare 9 aqua {
-    void TkpSetCapture(TkWindow *winPtr)
+    void TkMacOSXClearMenubarActive(void)
 }
 declare 10 aqua {
     int TkMacOSXDispatchMenuEvent(int menuID, int index)
 }
 declare 11 aqua {
-    void TkMacOSXClearMenubarActive(void)
+    void TkpSetCapture(TkWindow *winPtr)
 }
 declare 12 aqua {
     void TkMacOSXHandleTearoffMenu(void)
@@ -968,413 +965,413 @@ declare 54 aqua {
 interface tkIntXlib
 
 ################################
-# X functions
+# X functions for Windows
 
-declare 0 {
+declare 0 win {
     int XSetDashes(Display *display, GC gc, int dash_offset,
 	    _Xconst char *dash_list, int n)
 }
-declare 1 {
+declare 1 win {
     XModifierKeymap *XGetModifierMapping(Display *d)
 }
-declare 2 {
+declare 2 win {
     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 {
+declare 3 win {
     XImage *XGetImage(Display *d, Drawable dr, int i1, int i2,
 	    unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)
 }
-declare 4 {
+declare 4 win {
     char *XGetAtomName(Display *d, Atom a)
 }
-declare 5 {
+declare 5 win {
     char *XKeysymToString(KeySym k)
 }
-declare 6 {
+declare 6 win {
     Colormap XCreateColormap(Display *d, Window w, Visual *v, int i)
 }
-declare 7 {
+declare 7 win {
     Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
 	    XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2)
 }
-declare 8 {
+declare 8 win {
     Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2,
 	    unsigned int ui1, unsigned int ui2, XColor _Xconst *x1,
 	    XColor _Xconst *x2)
 }
-declare 9 {
+declare 9 win {
     GContext XGContextFromGC(GC g)
 }
-declare 10 {
+declare 10 win {
     XHostAddress *XListHosts(Display *d, int *i, Bool *b)
 }
 # second parameter was of type KeyCode
-declare 11 {
+declare 11 win {
     KeySym XKeycodeToKeysym(Display *d, unsigned int k, int i)
 }
-declare 12 {
+declare 12 win {
     KeySym XStringToKeysym(_Xconst char *c)
 }
-declare 13 {
+declare 13 win {
     Window XRootWindow(Display *d, int i)
 }
-declare 14 {
+declare 14 win {
     XErrorHandler XSetErrorHandler(XErrorHandler x)
 }
-declare 15 {
+declare 15 win {
     Status XIconifyWindow(Display *d, Window w, int i)
 }
-declare 16 {
+declare 16 win {
     Status XWithdrawWindow(Display *d, Window w, int i)
 }
-declare 17 {
+declare 17 win {
     Status XGetWMColormapWindows(Display *d, Window w, Window **wpp, int *ip)
 }
-declare 18 {
+declare 18 win {
     Status XAllocColor(Display *d, Colormap c, XColor *xp)
 }
-declare 19 {
+declare 19 win {
     int XBell(Display *d, int i)
 }
-declare 20 {
+declare 20 win {
     int XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1,
 	    int i2, _Xconst unsigned char *c, int i3)
 }
-declare 21 {
+declare 21 win {
     int XChangeWindowAttributes(Display *d, Window w, unsigned long ul,
 	    XSetWindowAttributes *x)
 }
-declare 22 {
+declare 22 win {
     int XClearWindow(Display *d, Window w)
 }
-declare 23 {
+declare 23 win {
     int XConfigureWindow(Display *d, Window w, unsigned int i,
 	    XWindowChanges *x)
 }
-declare 24 {
+declare 24 win {
     int XCopyArea(Display *d, Drawable dr1, Drawable dr2, GC g, int i1,
 	    int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
-declare 25 {
+declare 25 win {
     int 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 26 {
+declare 26 win {
     Pixmap XCreateBitmapFromData(Display *display, Drawable d,
 	    _Xconst char *data, unsigned int width, unsigned int height)
 }
-declare 27 {
+declare 27 win {
     int XDefineCursor(Display *d, Window w, Cursor c)
 }
-declare 28 {
+declare 28 win {
     int XDeleteProperty(Display *d, Window w, Atom a)
 }
-declare 29 {
+declare 29 win {
     int XDestroyWindow(Display *d, Window w)
 }
-declare 30 {
+declare 30 win {
     int XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2,
 	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
-declare 31 {
+declare 31 win {
     int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)
 }
-declare 32 {
+declare 32 win {
     int XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2,
 	    unsigned int ui1, unsigned int ui2)
 }
-declare 33 {
+declare 33 win {
     int XFillArc(Display *d, Drawable dr, GC g, int i1, int i2,
 	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
-declare 34 {
+declare 34 win {
     int XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x,
 	    int i1, int i2, int i3)
 }
-declare 35 {
+declare 35 win {
     int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i)
 }
-declare 36 {
+declare 36 win {
     int XForceScreenSaver(Display *d, int i)
 }
-declare 37 {
+declare 37 win {
     int XFreeColormap(Display *d, Colormap c)
 }
-declare 38 {
+declare 38 win {
     int XFreeColors(Display *d, Colormap c,
 	    unsigned long *ulp, int i, unsigned long ul)
 }
-declare 39 {
+declare 39 win {
     int XFreeCursor(Display *d, Cursor c)
 }
-declare 40 {
+declare 40 win {
     int XFreeModifiermap(XModifierKeymap *x)
 }
-declare 41 {
+declare 41 win {
     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 42 {
+declare 42 win {
     int XGetInputFocus(Display *d, Window *w, int *i)
 }
-declare 43 {
+declare 43 win {
     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 44 {
+declare 44 win {
     Status XGetWindowAttributes(Display *d, Window w, XWindowAttributes *x)
 }
-declare 45 {
+declare 45 win {
     int XGrabKeyboard(Display *d, Window w, Bool b, int i1, int i2, Time t)
 }
-declare 46 {
+declare 46 win {
     int XGrabPointer(Display *d, Window w1, Bool b, unsigned int ui,
 	    int i1, int i2, Window w2, Cursor c, Time t)
 }
-declare 47 {
+declare 47 win {
     KeyCode XKeysymToKeycode(Display *d, KeySym k)
 }
-declare 48 {
+declare 48 win {
     Status XLookupColor(Display *d, Colormap c1, _Xconst char *c2,
 	    XColor *x1, XColor *x2)
 }
-declare 49 {
+declare 49 win {
     int XMapWindow(Display *d, Window w)
 }
-declare 50 {
+declare 50 win {
     int XMoveResizeWindow(Display *d, Window w, int i1, int i2,
 	    unsigned int ui1, unsigned int ui2)
 }
-declare 51 {
+declare 51 win {
     int XMoveWindow(Display *d, Window w, int i1, int i2)
 }
-declare 52 {
+declare 52 win {
     int XNextEvent(Display *d, XEvent *x)
 }
-declare 53 {
+declare 53 win {
     int XPutBackEvent(Display *d, XEvent *x)
 }
-declare 54 {
+declare 54 win {
     int XQueryColors(Display *d, Colormap c, XColor *x, int i)
 }
-declare 55 {
+declare 55 win {
     Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3,
 	    int *i1, int *i2, int *i3, int *i4, unsigned int *ui)
 }
-declare 56 {
+declare 56 win {
     Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3,
 	    Window **w4, unsigned int *ui)
 }
-declare 57 {
+declare 57 win {
     int XRaiseWindow(Display *d, Window w)
 }
-declare 58 {
+declare 58 win {
     int XRefreshKeyboardMapping(XMappingEvent *x)
 }
-declare 59 {
+declare 59 win {
     int XResizeWindow(Display *d, Window w, unsigned int ui1,
 	    unsigned int ui2)
 }
-declare 60 {
+declare 60 win {
     int XSelectInput(Display *d, Window w, long l)
 }
-declare 61 {
+declare 61 win {
     Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x)
 }
-declare 62 {
+declare 62 win {
     int XSetCommand(Display *d, Window w, char **c, int i)
 }
-declare 63 {
+declare 63 win {
     int XSetIconName(Display *d, Window w, _Xconst char *c)
 }
-declare 64 {
+declare 64 win {
     int XSetInputFocus(Display *d, Window w, int i, Time t)
 }
-declare 65 {
+declare 65 win {
     int XSetSelectionOwner(Display *d, Atom a, Window w, Time t)
 }
-declare 66 {
+declare 66 win {
     int XSetWindowBackground(Display *d, Window w, unsigned long ul)
 }
-declare 67 {
+declare 67 win {
     int XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p)
 }
-declare 68 {
+declare 68 win {
     int XSetWindowBorder(Display *d, Window w, unsigned long ul)
 }
-declare 69 {
+declare 69 win {
     int XSetWindowBorderPixmap(Display *d, Window w, Pixmap p)
 }
-declare 70 {
+declare 70 win {
     int XSetWindowBorderWidth(Display *d, Window w, unsigned int ui)
 }
-declare 71 {
+declare 71 win {
     int XSetWindowColormap(Display *d, Window w, Colormap c)
 }
-declare 72 {
+declare 72 win {
     Bool XTranslateCoordinates(Display *d, Window w1, Window w2, int i1,
 	    int i2, int *i3, int *i4, Window *w3)
 }
-declare 73 {
+declare 73 win {
     int XUngrabKeyboard(Display *d, Time t)
 }
-declare 74 {
+declare 74 win {
     int XUngrabPointer(Display *d, Time t)
 }
-declare 75 {
+declare 75 win {
     int XUnmapWindow(Display *d, Window w)
 }
-declare 76 {
+declare 76 win {
     int XWindowEvent(Display *d, Window w, long l, XEvent *x)
 }
-declare 77 {
+declare 77 win {
     void XDestroyIC(XIC x)
 }
-declare 78 {
+declare 78 win {
     Bool XFilterEvent(XEvent *x, Window w)
 }
-declare 79 {
+declare 79 win {
     int XmbLookupString(XIC xi, XKeyPressedEvent *xk, char *c, int i,
 	    KeySym *k, Status *s)
 }
-declare 80 {
+declare 80 win {
     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 81 {
+declare 81 win {
     int XSetClipRectangles(Display *display, GC gc, int clip_x_origin,
 	    int clip_y_origin, XRectangle rectangles[], int n, int ordering)
 }
-declare 82 {
+declare 82 win {
     Status XParseColor(Display *display, Colormap map,
           _Xconst char *spec, XColor *colorPtr)
 }
-declare 83 {
+declare 83 win {
     GC XCreateGC(Display *display, Drawable d,
 	    unsigned long valuemask, XGCValues *values)
 }
-declare 84 {
+declare 84 win {
     int XFreeGC(Display *display, GC gc)
 }
-declare 85 {
+declare 85 win {
     Atom XInternAtom(Display *display, _Xconst char *atom_name,
 	    Bool only_if_exists)
 }
-declare 86 {
+declare 86 win {
     int XSetBackground(Display *display, GC gc, unsigned long foreground)
 }
-declare 87 {
+declare 87 win {
     int XSetForeground(Display *display, GC gc, unsigned long foreground)
 }
-declare 88 {
+declare 88 win {
     int XSetClipMask(Display *display, GC gc, Pixmap pixmap)
 }
-declare 89 {
+declare 89 win {
     int XSetClipOrigin(Display *display, GC gc,
 	    int clip_x_origin, int clip_y_origin)
 }
-declare 90 {
+declare 90 win {
     int XSetTSOrigin(Display *display, GC gc,
 	    int ts_x_origin, int ts_y_origin)
 }
-declare 91 {
+declare 91 win {
     int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values)
 }
-declare 92 {
+declare 92 win {
     int XSetFont(Display *display, GC gc, Font font)
 }
-declare 93 {
+declare 93 win {
     int XSetArcMode(Display *display, GC gc, int arc_mode)
 }
-declare 94 {
+declare 94 win {
     int XSetStipple(Display *display, GC gc, Pixmap stipple)
 }
-declare 95 {
+declare 95 win {
     int XSetFillRule(Display *display, GC gc, int fill_rule)
 }
-declare 96 {
+declare 96 win {
     int XSetFillStyle(Display *display, GC gc, int fill_style)
 }
-declare 97 {
+declare 97 win {
     int XSetFunction(Display *display, GC gc, int function)
 }
-declare 98 {
+declare 98 win {
     int XSetLineAttributes(Display *display, GC gc, unsigned int line_width,
 	    int line_style, int cap_style, int join_style)
 }
-declare 99 {
+declare 99 win {
     int _XInitImageFuncPtrs(XImage *image)
 }
-declare 100 {
+declare 100 win {
     XIC XCreateIC(XIM xim, ...)
 }
-declare 101 {
+declare 101 win {
     XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask,
 	    XVisualInfo *vinfo_template, int *nitems_return)
 }
-declare 102 {
+declare 102 win {
     void XSetWMClientMachine(Display *display, Window w,
 	    XTextProperty *text_prop)
 }
-declare 103 {
+declare 103 win {
     Status XStringListToTextProperty(char **list, int count,
 	    XTextProperty *text_prop_return)
 }
-declare 104 {
+declare 104 win {
     int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1,
 	    int x2, int y2)
 }
-declare 105 {
+declare 105 win {
     int XWarpPointer(Display *d, Window s, Window dw, int sx, int sy,
 	    unsigned int sw, unsigned int sh, int dx, int dy)
 }
-declare 106 {
+declare 106 win {
     int XFillRectangle(Display *display, Drawable d, GC gc,
 	    int x, int y, unsigned int width, unsigned int height)
 }
 
 # New in Tk 8.6
-declare 107 {
+declare 107 win {
     int XFlush(Display *display)
 }
-declare 108 {
+declare 108 win {
     int XGrabServer(Display *display)
 }
-declare 109 {
+declare 109 win {
     int XUngrabServer(Display *display)
 }
-declare 110 {
+declare 110 win {
     int XFree(void *data)
 }
-declare 111 {
+declare 111 win {
     int XNoOp(Display *display)
 }
-declare 112 {
+declare 112 win {
     XAfterFunction XSynchronize(Display *display, Bool onoff)
 }
-declare 113 {
+declare 113 win {
     int XSync(Display *display, Bool discard)
 }
-declare 114 {
+declare 114 win {
     VisualID XVisualIDFromVisual(Visual *visual)
 }
 
 # For tktreectrl
-declare 120 {
+declare 120 win {
     int XOffsetRegion(Region rgn, int dx, int dy)
 }
-declare 121 {
+declare 121 win {
     int XUnionRegion(Region srca, Region srcb, Region dr_return)
 }
 
 # For 3dcanvas
-declare 122 {
+declare 122 win {
     Window XCreateWindow(Display *display, Window parent, int x, int y,
 	    unsigned int width, unsigned int height,
 	    unsigned int border_width, int depth, unsigned int clazz,
@@ -1383,92 +1380,598 @@ declare 122 {
 }
 
 # Various, e.g. for stub-enabled BLT
-declare 129 {
+declare 129 win {
     int XLowerWindow(Display *d, Window w)
 }
-declare 130 {
+declare 130 win {
     int XFillArcs(Display *d, Drawable dr, GC gc, XArc *a, int n)
 }
-declare 131 {
+declare 131 win {
     int XDrawArcs(Display *d, Drawable dr, GC gc, XArc *a, int n)
 }
-declare 132 {
+declare 132 win {
     int XDrawRectangles(Display *d, Drawable dr, GC gc, XRectangle *r, int n)
 }
-declare 133 {
+declare 133 win {
     int XDrawSegments(Display *d, Drawable dr, GC gc, XSegment *s, int n)
 }
-declare 134 {
+declare 134 win {
     int XDrawPoint(Display *d, Drawable dr, GC gc, int x, int y)
 }
-declare 135 {
+declare 135 win {
     int XDrawPoints(Display *d, Drawable dr, GC gc, XPoint *p, int n, int m)
 }
-declare 136 {
+declare 136 win {
     int XReparentWindow(Display *d, Window w, Window p, int x, int y)
 }
-declare 137 {
+declare 137 win {
     int XPutImage(Display *d, Drawable dr, GC gc, XImage *im,
 	    int sx, int sy, int dx, int dy,
 	    unsigned int w, unsigned int h)
 }
-declare 138 {
+declare 138 win {
     Region XPolygonRegion(XPoint *pts, int n, int rule)
 }
-declare 139 {
+declare 139 win {
     int XPointInRegion(Region rgn, int x, int y)
 }
 # For XIM
-declare 140 {
+declare 140 win {
     XVaNestedList XVaCreateNestedList(int dummy, ...)
 }
-declare 141 {
+declare 141 win {
     char *XSetICValues(XIC xic, ...)
 }
-declare 142 {
+declare 142 win {
     char *XGetICValues(XIC xic, ...)
 }
-declare 143 {
+declare 143 win {
     void XSetICFocus(XIC xic)
 }
-declare 147 {
+declare 147 win {
     void XFreeFontSet(Display *display, XFontSet fontset)
 }
-declare 148 {
+declare 148 win {
     int XCloseIM(XIM im)
 }
-declare 149 {
+declare 149 win {
     Bool XRegisterIMInstantiateCallback(Display *dpy, struct _XrmHashBucketRec *rbd,
 	    char *res_name, char *res_class, XIDProc callback, XPointer client_data)
 }
-declare 150 {
+declare 150 win {
     Bool XUnregisterIMInstantiateCallback(Display *dpy, struct _XrmHashBucketRec *rbd,
 	    char *res_name, char *res_class, XIDProc callback, XPointer client_data)
 }
-declare 151 {
+declare 151 win {
     char *XSetLocaleModifiers(const char *modifier_list)
 }
-declare 152 {
+declare 152 win {
     XIM XOpenIM(Display *dpy, struct _XrmHashBucketRec *rdb, char *res_name,
 	    char *res_class)
 }
-declare 153 {
+declare 153 win {
     char *XGetIMValues(XIM im, ...)
 }
-declare 154 {
+declare 154 win {
     char *XSetIMValues(XIM im, ...)
 }
-declare 155 {
+declare 155 win {
     XFontSet XCreateFontSet(Display *display, _Xconst char *base_font_name_list,
 	    char ***missing_charset_list, int *missing_charset_count, char **def_string)
 }
-declare 156 {
+declare 156 win {
     void XFreeStringList(char **list)
 }
-declare 157 {
+declare 157 win {
     KeySym XkbKeycodeToKeysym(Display *d, unsigned int k, int g, int i)
 }
-declare 158 {
+declare 158 win {
+    Display *XkbOpenDisplay(const char *name, int *ev_rtrn, int *err_rtrn,
+	    int *major_rtrn, int *minor_rtrn, int *reason)
+}
+
+################################
+# X functions for MacOSX
+
+declare 0 macosx {
+    int XSetDashes(Display *display, GC gc, int dash_offset,
+	    _Xconst char *dash_list, int n)
+}
+declare 1 macosx {
+    XModifierKeymap *XGetModifierMapping(Display *d)
+}
+declare 2 macosx {
+    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 macosx {
+    XImage *XGetImage(Display *d, Drawable dr, int i1, int i2,
+	    unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)
+}
+declare 4 macosx {
+    char *XGetAtomName(Display *d, Atom a)
+}
+declare 5 macosx {
+    char *XKeysymToString(KeySym k)
+}
+declare 6 macosx {
+    Colormap XCreateColormap(Display *d, Window w, Visual *v, int i)
+}
+declare 7 macosx {
+    Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
+	    XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2)
+}
+declare 8 macosx {
+    Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2,
+	    unsigned int ui1, unsigned int ui2, XColor _Xconst *x1,
+	    XColor _Xconst *x2)
+}
+declare 9 macosx {
+    GContext XGContextFromGC(GC g)
+}
+declare 10 macosx {
+    XHostAddress *XListHosts(Display *d, int *i, Bool *b)
+}
+# second parameter was of type KeyCode
+declare 11 macosx {
+    KeySym XKeycodeToKeysym(Display *d, unsigned int k, int i)
+}
+declare 12 macosx {
+    KeySym XStringToKeysym(_Xconst char *c)
+}
+declare 13 macosx {
+    Window XRootWindow(Display *d, int i)
+}
+declare 14 macosx {
+    XErrorHandler XSetErrorHandler(XErrorHandler x)
+}
+declare 15 macosx {
+    Status XIconifyWindow(Display *d, Window w, int i)
+}
+declare 16 macosx {
+    Status XWithdrawWindow(Display *d, Window w, int i)
+}
+declare 17 macosx {
+    Status XGetWMColormapWindows(Display *d, Window w, Window **wpp, int *ip)
+}
+declare 18 macosx {
+    Status XAllocColor(Display *d, Colormap c, XColor *xp)
+}
+declare 19 macosx {
+    int XBell(Display *d, int i)
+}
+declare 20 macosx {
+    int XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1,
+	    int i2, _Xconst unsigned char *c, int i3)
+}
+declare 21 macosx {
+    int XChangeWindowAttributes(Display *d, Window w, unsigned long ul,
+	    XSetWindowAttributes *x)
+}
+declare 22 macosx {
+    int XClearWindow(Display *d, Window w)
+}
+declare 23 macosx {
+    int XConfigureWindow(Display *d, Window w, unsigned int i,
+	    XWindowChanges *x)
+}
+declare 24 macosx {
+    int XCopyArea(Display *d, Drawable dr1, Drawable dr2, GC g, int i1,
+	    int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)
+}
+declare 25 macosx {
+    int 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 26 macosx {
+    Pixmap XCreateBitmapFromData(Display *display, Drawable d,
+	    _Xconst char *data, unsigned int width, unsigned int height)
+}
+declare 27 macosx {
+    int XDefineCursor(Display *d, Window w, Cursor c)
+}
+declare 28 macosx {
+    int XDeleteProperty(Display *d, Window w, Atom a)
+}
+declare 29 macosx {
+    int XDestroyWindow(Display *d, Window w)
+}
+declare 30 macosx {
+    int XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2,
+	    unsigned int ui1, unsigned int ui2, int i3, int i4)
+}
+declare 31 macosx {
+    int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)
+}
+declare 32 macosx {
+    int XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2,
+	    unsigned int ui1, unsigned int ui2)
+}
+declare 33 macosx {
+    int XFillArc(Display *d, Drawable dr, GC g, int i1, int i2,
+	    unsigned int ui1, unsigned int ui2, int i3, int i4)
+}
+declare 34 macosx {
+    int XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x,
+	    int i1, int i2, int i3)
+}
+declare 35 macosx {
+    int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i)
+}
+declare 36 macosx {
+    int XForceScreenSaver(Display *d, int i)
+}
+declare 37 macosx {
+    int XFreeColormap(Display *d, Colormap c)
+}
+declare 38 macosx {
+    int XFreeColors(Display *d, Colormap c,
+	    unsigned long *ulp, int i, unsigned long ul)
+}
+declare 39 macosx {
+    int XFreeCursor(Display *d, Cursor c)
+}
+declare 40 macosx {
+    int XFreeModifiermap(XModifierKeymap *x)
+}
+declare 41 macosx {
+    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 42 macosx {
+    int XGetInputFocus(Display *d, Window *w, int *i)
+}
+declare 43 macosx {
+    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 44 macosx {
+    Status XGetWindowAttributes(Display *d, Window w, XWindowAttributes *x)
+}
+declare 45 macosx {
+    int XGrabKeyboard(Display *d, Window w, Bool b, int i1, int i2, Time t)
+}
+declare 46 macosx {
+    int XGrabPointer(Display *d, Window w1, Bool b, unsigned int ui,
+	    int i1, int i2, Window w2, Cursor c, Time t)
+}
+declare 47 macosx {
+    KeyCode XKeysymToKeycode(Display *d, KeySym k)
+}
+declare 48 macosx {
+    Status XLookupColor(Display *d, Colormap c1, _Xconst char *c2,
+	    XColor *x1, XColor *x2)
+}
+declare 49 macosx {
+    int XMapWindow(Display *d, Window w)
+}
+declare 50 macosx {
+    int XMoveResizeWindow(Display *d, Window w, int i1, int i2,
+	    unsigned int ui1, unsigned int ui2)
+}
+declare 51 macosx {
+    int XMoveWindow(Display *d, Window w, int i1, int i2)
+}
+declare 52 macosx {
+    int XNextEvent(Display *d, XEvent *x)
+}
+declare 53 macosx {
+    int XPutBackEvent(Display *d, XEvent *x)
+}
+declare 54 macosx {
+    int XQueryColors(Display *d, Colormap c, XColor *x, int i)
+}
+declare 55 macosx {
+    Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3,
+	    int *i1, int *i2, int *i3, int *i4, unsigned int *ui)
+}
+declare 56 macosx {
+    Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3,
+	    Window **w4, unsigned int *ui)
+}
+declare 57 macosx {
+    int XRaiseWindow(Display *d, Window w)
+}
+declare 58 macosx {
+    int XRefreshKeyboardMapping(XMappingEvent *x)
+}
+declare 59 macosx {
+    int XResizeWindow(Display *d, Window w, unsigned int ui1,
+	    unsigned int ui2)
+}
+declare 60 macosx {
+    int XSelectInput(Display *d, Window w, long l)
+}
+declare 61 macosx {
+    Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x)
+}
+declare 62 macosx {
+    int XSetCommand(Display *d, Window w, char **c, int i)
+}
+declare 63 macosx {
+    int XSetIconName(Display *d, Window w, _Xconst char *c)
+}
+declare 64 macosx {
+    int XSetInputFocus(Display *d, Window w, int i, Time t)
+}
+declare 65 macosx {
+    int XSetSelectionOwner(Display *d, Atom a, Window w, Time t)
+}
+declare 66 macosx {
+    int XSetWindowBackground(Display *d, Window w, unsigned long ul)
+}
+declare 67 macosx {
+    int XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p)
+}
+declare 68 macosx {
+    int XSetWindowBorder(Display *d, Window w, unsigned long ul)
+}
+declare 69 macosx {
+    int XSetWindowBorderPixmap(Display *d, Window w, Pixmap p)
+}
+declare 70 macosx {
+    int XSetWindowBorderWidth(Display *d, Window w, unsigned int ui)
+}
+declare 71 macosx {
+    int XSetWindowColormap(Display *d, Window w, Colormap c)
+}
+declare 72 macosx {
+    Bool XTranslateCoordinates(Display *d, Window w1, Window w2, int i1,
+	    int i2, int *i3, int *i4, Window *w3)
+}
+declare 73 macosx {
+    int XUngrabKeyboard(Display *d, Time t)
+}
+declare 74 macosx {
+    int XUngrabPointer(Display *d, Time t)
+}
+declare 75 macosx {
+    int XUnmapWindow(Display *d, Window w)
+}
+declare 76 macosx {
+    int XWindowEvent(Display *d, Window w, long l, XEvent *x)
+}
+declare 77 macosx {
+    void XDestroyIC(XIC x)
+}
+declare 78 macosx {
+    Bool XFilterEvent(XEvent *x, Window w)
+}
+declare 79 macosx {
+    int XmbLookupString(XIC xi, XKeyPressedEvent *xk, char *c, int i,
+	    KeySym *k, Status *s)
+}
+declare 80 macosx {
+    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 81 macosx {
+    int XSetClipRectangles(Display *display, GC gc, int clip_x_origin,
+	    int clip_y_origin, XRectangle rectangles[], int n, int ordering)
+}
+declare 82 macosx {
+    Status XParseColor(Display *display, Colormap map,
+          _Xconst char *spec, XColor *colorPtr)
+}
+declare 83 macosx {
+    GC XCreateGC(Display *display, Drawable d,
+	    unsigned long valuemask, XGCValues *values)
+}
+declare 84 macosx {
+    int XFreeGC(Display *display, GC gc)
+}
+declare 85 macosx {
+    Atom XInternAtom(Display *display, _Xconst char *atom_name,
+	    Bool only_if_exists)
+}
+declare 86 macosx {
+    int XSetBackground(Display *display, GC gc, unsigned long foreground)
+}
+declare 87 macosx {
+    int XSetForeground(Display *display, GC gc, unsigned long foreground)
+}
+declare 88 macosx {
+    int XSetClipMask(Display *display, GC gc, Pixmap pixmap)
+}
+declare 89 macosx {
+    int XSetClipOrigin(Display *display, GC gc,
+	    int clip_x_origin, int clip_y_origin)
+}
+declare 90 macosx {
+    int XSetTSOrigin(Display *display, GC gc,
+	    int ts_x_origin, int ts_y_origin)
+}
+declare 91 macosx {
+    int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values)
+}
+declare 92 macosx {
+    int XSetFont(Display *display, GC gc, Font font)
+}
+declare 93 macosx {
+    int XSetArcMode(Display *display, GC gc, int arc_mode)
+}
+declare 94 macosx {
+    int XSetStipple(Display *display, GC gc, Pixmap stipple)
+}
+declare 95 macosx {
+    int XSetFillRule(Display *display, GC gc, int fill_rule)
+}
+declare 96 macosx {
+    int XSetFillStyle(Display *display, GC gc, int fill_style)
+}
+declare 97 macosx {
+    int XSetFunction(Display *display, GC gc, int function)
+}
+declare 98 macosx {
+    int XSetLineAttributes(Display *display, GC gc, unsigned int line_width,
+	    int line_style, int cap_style, int join_style)
+}
+declare 99 macosx {
+    int _XInitImageFuncPtrs(XImage *image)
+}
+declare 100 macosx {
+    XIC XCreateIC(XIM xim, ...)
+}
+declare 101 macosx {
+    XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask,
+	    XVisualInfo *vinfo_template, int *nitems_return)
+}
+declare 102 macosx {
+    void XSetWMClientMachine(Display *display, Window w,
+	    XTextProperty *text_prop)
+}
+declare 103 macosx {
+    Status XStringListToTextProperty(char **list, int count,
+	    XTextProperty *text_prop_return)
+}
+declare 104 macosx {
+    int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1,
+	    int x2, int y2)
+}
+declare 105 macosx {
+    int XWarpPointer(Display *d, Window s, Window dw, int sx, int sy,
+	    unsigned int sw, unsigned int sh, int dx, int dy)
+}
+declare 106 macosx {
+    int XFillRectangle(Display *display, Drawable d, GC gc,
+	    int x, int y, unsigned int width, unsigned int height)
+}
+
+# New in Tk 8.6
+declare 107 macosx {
+    int XFlush(Display *display)
+}
+declare 108 macosx {
+    int XGrabServer(Display *display)
+}
+declare 109 macosx {
+    int XUngrabServer(Display *display)
+}
+declare 110 macosx {
+    int XFree(void *data)
+}
+declare 111 macosx {
+    int XNoOp(Display *display)
+}
+declare 112 macosx {
+    XAfterFunction XSynchronize(Display *display, Bool onoff)
+}
+declare 113 macosx {
+    int XSync(Display *display, Bool discard)
+}
+declare 114 macosx {
+    VisualID XVisualIDFromVisual(Visual *visual)
+}
+
+# For tktreectrl
+declare 120 macosx {
+    int XOffsetRegion(Region rgn, int dx, int dy)
+}
+declare 121 macosx {
+    int XUnionRegion(Region srca, Region srcb, Region dr_return)
+}
+
+# For 3dcanvas
+declare 122 macosx {
+    Window XCreateWindow(Display *display, Window parent, int x, int y,
+	    unsigned int width, unsigned int height,
+	    unsigned int border_width, int depth, unsigned int clazz,
+	    Visual *visual, unsigned long value_mask,
+	    XSetWindowAttributes *attributes)
+}
+
+# Various, e.g. for stub-enabled BLT
+declare 129 macosx {
+    int XLowerWindow(Display *d, Window w)
+}
+declare 130 macosx {
+    int XFillArcs(Display *d, Drawable dr, GC gc, XArc *a, int n)
+}
+declare 131 macosx {
+    int XDrawArcs(Display *d, Drawable dr, GC gc, XArc *a, int n)
+}
+declare 132 macosx {
+    int XDrawRectangles(Display *d, Drawable dr, GC gc, XRectangle *r, int n)
+}
+declare 133 macosx {
+    int XDrawSegments(Display *d, Drawable dr, GC gc, XSegment *s, int n)
+}
+declare 134 macosx {
+    int XDrawPoint(Display *d, Drawable dr, GC gc, int x, int y)
+}
+declare 135 macosx {
+    int XDrawPoints(Display *d, Drawable dr, GC gc, XPoint *p, int n, int m)
+}
+declare 136 macosx {
+    int XReparentWindow(Display *d, Window w, Window p, int x, int y)
+}
+declare 137 macosx {
+    int XPutImage(Display *d, Drawable dr, GC gc, XImage *im,
+	    int sx, int sy, int dx, int dy,
+	    unsigned int w, unsigned int h)
+}
+declare 138 macosx {
+    Region XPolygonRegion(XPoint *pts, int n, int rule)
+}
+declare 139 macosx {
+    int XPointInRegion(Region rgn, int x, int y)
+}
+# For XIM
+declare 140 macosx {
+    XVaNestedList XVaCreateNestedList(int dummy, ...)
+}
+declare 141 macosx {
+    char *XSetICValues(XIC xic, ...)
+}
+declare 142 macosx {
+    char *XGetICValues(XIC xic, ...)
+}
+declare 143 macosx {
+    void XSetICFocus(XIC xic)
+}
+declare 147 macosx {
+    void XFreeFontSet(Display *display, XFontSet fontset)
+}
+declare 148 macosx {
+    int XCloseIM(XIM im)
+}
+declare 149 macosx {
+    Bool XRegisterIMInstantiateCallback(Display *dpy, struct _XrmHashBucketRec *rbd,
+	    char *res_name, char *res_class, XIDProc callback, XPointer client_data)
+}
+declare 150 macosx {
+    Bool XUnregisterIMInstantiateCallback(Display *dpy, struct _XrmHashBucketRec *rbd,
+	    char *res_name, char *res_class, XIDProc callback, XPointer client_data)
+}
+declare 151 macosx {
+    char *XSetLocaleModifiers(const char *modifier_list)
+}
+declare 152 macosx {
+    XIM XOpenIM(Display *dpy, struct _XrmHashBucketRec *rdb, char *res_name,
+	    char *res_class)
+}
+declare 153 macosx {
+    char *XGetIMValues(XIM im, ...)
+}
+declare 154 macosx {
+    char *XSetIMValues(XIM im, ...)
+}
+declare 155 macosx {
+    XFontSet XCreateFontSet(Display *display, _Xconst char *base_font_name_list,
+	    char ***missing_charset_list, int *missing_charset_count, char **def_string)
+}
+declare 156 macosx {
+    void XFreeStringList(char **list)
+}
+declare 157 macosx {
+    KeySym XkbKeycodeToKeysym(Display *d, unsigned int k, int g, int i)
+}
+declare 158 macosx {
     Display *XkbOpenDisplay(const char *name, int *ev_rtrn, int *err_rtrn,
 	    int *major_rtrn, int *minor_rtrn, int *reason)
 }