1 files changed, 194 insertions, 112 deletions

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 4c8ce38..dae3147 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -99,7 +99,7 @@ declare 21 {
 	    const TkStateMap *mapPtr, const char *strKey)
 }
 declare 22 {
-    CONST86 char *TkFindStateString(const TkStateMap *mapPtr, int numKey)
+    const char *TkFindStateString(const TkStateMap *mapPtr, int numKey)
 }
 declare 23 {
     void TkFocusDeadWindow(TkWindow *winPtr)
@@ -182,7 +182,7 @@ declare 45 {
     void TkInstallFrameMenu(Tk_Window tkwin)
 }
 declare 46 {
-    CONST86 char *TkKeysymToString(KeySym keysym)
+    const char *TkKeysymToString(KeySym keysym)
 }
 declare 47 {
     int TkLineToArea(double end1Ptr[], double end2Ptr[], double rectPtr[])
@@ -389,7 +389,7 @@ declare 108 {
 	    Tcl_Obj *objPtr, Tk_Window *windowPtr)
 }
 declare 109 {
-    CONST86 char *TkpGetString(TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr)
+    const char *TkpGetString(TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr)
 }
 declare 110 {
     void TkpGetSubFonts(Tcl_Interp *interp, Tk_Font tkfont)
@@ -570,7 +570,7 @@ declare 169 {
 	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
 declare 170 {
-    CONST86 char *TkStatePrintProc(ClientData clientData, Tk_Window tkwin,
+    const char *TkStatePrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
 declare 171 {
@@ -578,7 +578,7 @@ declare 171 {
 	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
 declare 172 {
-    CONST86 char *TkCanvasDashPrintProc(ClientData clientData, Tk_Window tkwin,
+    const char *TkCanvasDashPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
 declare 173 {
@@ -586,7 +586,7 @@ declare 173 {
 	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
 declare 174 {
-    CONST86 char *TkOffsetPrintProc(ClientData clientData, Tk_Window tkwin,
+    const char *TkOffsetPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
 declare 175 {
@@ -594,7 +594,7 @@ declare 175 {
 	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
 declare 176 {
-    CONST86 char *TkPixelPrintProc(ClientData clientData, Tk_Window tkwin,
+    const char *TkPixelPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
 declare 177 {
@@ -602,7 +602,7 @@ declare 177 {
 	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
 declare 178 {
-    CONST86 char *TkOrientPrintProc(ClientData clientData, Tk_Window tkwin,
+    const char *TkOrientPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
 declare 179 {
@@ -610,7 +610,7 @@ declare 179 {
 	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
 declare 180 {
-    CONST86 char *TkSmoothPrintProc(ClientData clientData, Tk_Window tkwin,
+    const char *TkSmoothPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
 
@@ -634,6 +634,13 @@ declare 184 {
 	    Tk_Font tkfont, const char *source, int numBytes, double x,
 	    double y, double angle)
 }
+
+# Debugging / testing functions for photo images
+declare 185 {
+    int TkDebugPhotoStringMatchDef(Tcl_Interp *inter, Tcl_Obj *data,
+            Tcl_Obj *formatString, int *widthPtr, int *heightPtr)
+}
+
 
 ##############################################################################
 
@@ -1009,7 +1016,7 @@ declare 46 aqua {
     int TkpIsWindowFloating(void *window)
 }
 declare 47 aqua {
-    Tk_Window TkMacOSXGetCapture(void)
+    Tk_Window TkpGetCapture(void)
 }
 declare 49 aqua {
     Tk_Window TkGetTransientMaster(TkWindow *winPtr)
@@ -1496,355 +1503,430 @@ declare 137 win {
 	    int sx, int sy, int dx, int dy,
 	    unsigned int w, unsigned int h)
 }
+declare 138 win {
+    Region XPolygonRegion(XPoint *pts, int n, int rule)
+}
+declare 139 win {
+    int XPointInRegion(Region rgn, int x, int y)
+}
+# For XIM
+declare 140 win {
+    XVaNestedList XVaCreateNestedList(int dummy, ...)
+}
+declare 141 win {
+    char *XSetICValues(XIC xic, ...)
+}
+declare 142 win {
+    char *XGetICValues(XIC xic, ...)
+}
+declare 143 win {
+    void XSetICFocus(XIC xic)
+}
 
 ################################
-# X functions for Aqua
+# X functions for MacOSX
 
-declare 0 aqua {
+declare 0 macosx {
     int XSetDashes(Display *display, GC gc, int dash_offset,
 	    _Xconst char *dash_list, int n)
 }
-declare 1 aqua {
+declare 1 macosx {
     XModifierKeymap *XGetModifierMapping(Display *d)
 }
-declare 2 aqua {
+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 aqua {
+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 aqua {
+declare 4 macosx {
     char *XGetAtomName(Display *d, Atom a)
 }
-declare 5 aqua {
+declare 5 macosx {
     char *XKeysymToString(KeySym k)
 }
-declare 6 aqua {
+declare 6 macosx {
     Colormap XCreateColormap(Display *d, Window w, Visual *v, int i)
 }
-declare 7 aqua {
+declare 7 macosx {
     GContext XGContextFromGC(GC g)
 }
-declare 8 aqua {
-    KeySym XKeycodeToKeysym(Display *d, KeyCode k, int i)
+# second parameter was of type KeyCode
+declare 8 macosx {
+    KeySym XKeycodeToKeysym(Display *d, unsigned int k, int i)
 }
-declare 9 aqua {
+declare 9 macosx {
     KeySym XStringToKeysym(_Xconst char *c)
 }
-declare 10 aqua {
+declare 10 macosx {
     Window XRootWindow(Display *d, int i)
 }
-declare 11 aqua {
+declare 11 macosx {
     XErrorHandler XSetErrorHandler(XErrorHandler x)
 }
-declare 12 aqua {
+declare 12 macosx {
     Status XAllocColor(Display *d, Colormap c, XColor *xp)
 }
-declare 13 aqua {
+declare 13 macosx {
     int XBell(Display *d, int i)
 }
-declare 14 aqua {
+declare 14 macosx {
     int XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1,
 	    int i2, _Xconst unsigned char *c, int i3)
 }
-declare 15 aqua {
+declare 15 macosx {
     int XChangeWindowAttributes(Display *d, Window w, unsigned long ul,
 	    XSetWindowAttributes *x)
 }
-declare 16 aqua {
+declare 16 macosx {
     int XConfigureWindow(Display *d, Window w, unsigned int i,
 	    XWindowChanges *x)
 }
-declare 17 aqua {
+declare 17 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 18 aqua {
+declare 18 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 19 aqua {
+declare 19 macosx {
     Pixmap XCreateBitmapFromData(Display *display, Drawable d,
 	    _Xconst char *data, unsigned int width, unsigned int height)
 }
-declare 20 aqua {
+declare 20 macosx {
     int XDefineCursor(Display *d, Window w, Cursor c)
 }
-declare 21 aqua {
+declare 21 macosx {
     int XDestroyWindow(Display *d, Window w)
 }
-declare 22 aqua {
+declare 22 macosx {
     int XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2,
 	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
-declare 23 aqua {
+declare 23 macosx {
     int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)
 }
-declare 24 aqua {
+declare 24 macosx {
     int XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2,
 	    unsigned int ui1, unsigned int ui2)
 }
-declare 25 aqua {
+declare 25 macosx {
     int XFillArc(Display *d, Drawable dr, GC g, int i1, int i2,
 	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
-declare 26 aqua {
+declare 26 macosx {
     int XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x,
 	    int i1, int i2, int i3)
 }
-declare 27 aqua {
+declare 27 macosx {
     int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i)
 }
-declare 28 aqua {
+declare 28 macosx {
     int XFreeColormap(Display *d, Colormap c)
 }
-declare 29 aqua {
+declare 29 macosx {
     int XFreeColors(Display *d, Colormap c,
 	    unsigned long *ulp, int i, unsigned long ul)
 }
-declare 30 aqua {
+declare 30 macosx {
     int XFreeModifiermap(XModifierKeymap *x)
 }
-declare 31 aqua {
+declare 31 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 32 aqua {
+declare 32 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 33 aqua {
+declare 33 macosx {
     int XGrabKeyboard(Display *d, Window w, Bool b, int i1, int i2, Time t)
 }
-declare 34 aqua {
+declare 34 macosx {
     int XGrabPointer(Display *d, Window w1, Bool b, unsigned int ui,
 	    int i1, int i2, Window w2, Cursor c, Time t)
 }
-declare 35 aqua {
+declare 35 macosx {
     KeyCode XKeysymToKeycode(Display *d, KeySym k)
 }
-declare 36 aqua {
+declare 36 macosx {
     int XMapWindow(Display *d, Window w)
 }
-declare 37 aqua {
+declare 37 macosx {
     int XMoveResizeWindow(Display *d, Window w, int i1, int i2,
 	    unsigned int ui1, unsigned int ui2)
 }
-declare 38 aqua {
+declare 38 macosx {
     int XMoveWindow(Display *d, Window w, int i1, int i2)
 }
-declare 39 aqua {
+declare 39 macosx {
     Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3,
 	    int *i1, int *i2, int *i3, int *i4, unsigned int *ui)
 }
-declare 40 aqua {
+declare 40 macosx {
     int XRaiseWindow(Display *d, Window w)
 }
-declare 41 aqua {
+declare 41 macosx {
     int XRefreshKeyboardMapping(XMappingEvent *x)
 }
-declare 42 aqua {
+declare 42 macosx {
     int XResizeWindow(Display *d, Window w, unsigned int ui1,
 	    unsigned int ui2)
 }
-declare 43 aqua {
+declare 43 macosx {
     int XSelectInput(Display *d, Window w, long l)
 }
-declare 44 aqua {
+declare 44 macosx {
     Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x)
 }
-declare 45 aqua {
+declare 45 macosx {
     int XSetIconName(Display *d, Window w, _Xconst char *c)
 }
-declare 46 aqua {
+declare 46 macosx {
     int XSetInputFocus(Display *d, Window w, int i, Time t)
 }
-declare 47 aqua {
+declare 47 macosx {
     int XSetSelectionOwner(Display *d, Atom a, Window w, Time t)
 }
-declare 48 aqua {
+declare 48 macosx {
     int XSetWindowBackground(Display *d, Window w, unsigned long ul)
 }
-declare 49 aqua {
+declare 49 macosx {
     int XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p)
 }
-declare 50 aqua {
+declare 50 macosx {
     int XSetWindowBorder(Display *d, Window w, unsigned long ul)
 }
-declare 51 aqua {
+declare 51 macosx {
     int XSetWindowBorderPixmap(Display *d, Window w, Pixmap p)
 }
-declare 52 aqua {
+declare 52 macosx {
     int XSetWindowBorderWidth(Display *d, Window w, unsigned int ui)
 }
-declare 53 aqua {
+declare 53 macosx {
     int XSetWindowColormap(Display *d, Window w, Colormap c)
 }
-declare 54 aqua {
+declare 54 macosx {
     int XUngrabKeyboard(Display *d, Time t)
 }
-declare 55 aqua {
+declare 55 macosx {
     int XUngrabPointer(Display *d, Time t)
 }
-declare 56 aqua {
+declare 56 macosx {
     int XUnmapWindow(Display *d, Window w)
 }
-declare 57 aqua {
+declare 57 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 58 aqua {
+declare 58 macosx {
     Status XParseColor(Display *display, Colormap map,
           _Xconst char *spec, XColor *colorPtr)
 }
-declare 59 aqua {
+declare 59 macosx {
     GC XCreateGC(Display *display, Drawable d,
 	    unsigned long valuemask, XGCValues *values)
 }
-declare 60 aqua {
+declare 60 macosx {
     int XFreeGC(Display *display, GC gc)
 }
-declare 61 aqua {
+declare 61 macosx {
     Atom XInternAtom(Display *display, _Xconst char *atom_name,
 	    Bool only_if_exists)
 }
-declare 62 aqua {
+declare 62 macosx {
     int XSetBackground(Display *display, GC gc, unsigned long foreground)
 }
-declare 63 aqua {
+declare 63 macosx {
     int XSetForeground(Display *display, GC gc, unsigned long foreground)
 }
-declare 64 aqua {
+declare 64 macosx {
     int XSetClipMask(Display *display, GC gc, Pixmap pixmap)
 }
-declare 65 aqua {
+declare 65 macosx {
     int XSetClipOrigin(Display *display, GC gc,
 	    int clip_x_origin, int clip_y_origin)
 }
-declare 66 aqua {
+declare 66 macosx {
     int XSetTSOrigin(Display *display, GC gc,
 	    int ts_x_origin, int ts_y_origin)
 }
-declare 67 aqua {
+declare 67 macosx {
     int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values)
 }
-declare 68 aqua {
+declare 68 macosx {
     int XSetFont(Display *display, GC gc, Font font)
 }
-declare 69 aqua {
+declare 69 macosx {
     int XSetArcMode(Display *display, GC gc, int arc_mode)
 }
-declare 70 aqua {
+declare 70 macosx {
     int XSetStipple(Display *display, GC gc, Pixmap stipple)
 }
-declare 71 aqua {
+declare 71 macosx {
     int XSetFillRule(Display *display, GC gc, int fill_rule)
 }
-declare 72 aqua {
+declare 72 macosx {
     int XSetFillStyle(Display *display, GC gc, int fill_style)
 }
-declare 73 aqua {
+declare 73 macosx {
     int XSetFunction(Display *display, GC gc, int function)
 }
-declare 74 aqua {
+declare 74 macosx {
     int XSetLineAttributes(Display *display, GC gc, unsigned int line_width,
 	    int line_style, int cap_style, int join_style)
 }
-declare 75 aqua {
+declare 75 macosx {
     int _XInitImageFuncPtrs(XImage *image)
 }
-declare 76 aqua {
+declare 76 macosx {
     XIC XCreateIC(XIM xim, ...)
 }
-declare 77 aqua {
+declare 77 macosx {
     XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask,
 	    XVisualInfo *vinfo_template, int *nitems_return)
 }
-declare 78 aqua {
+declare 78 macosx {
     void XSetWMClientMachine(Display *display, Window w,
 	    XTextProperty *text_prop)
 }
-declare 79 aqua {
+declare 79 macosx {
     Status XStringListToTextProperty(char **list, int count,
 	    XTextProperty *text_prop_return)
 }
-declare 80 aqua {
+declare 80 macosx {
     int XDrawSegments(Display *display, Drawable d, GC gc,
 	    XSegment *segments, int nsegments)
 }
-declare 81 aqua {
+declare 81 macosx {
     int XForceScreenSaver(Display *display, int mode)
 }
-declare 82 aqua {
+declare 82 macosx {
     int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1,
 	    int x2, int y2)
 }
-declare 83 aqua {
+declare 83 macosx {
     int XFillRectangle(Display *display, Drawable d, GC gc,
 	    int x, int y, unsigned int width, unsigned int height)
 }
-declare 84 aqua {
+declare 84 macosx {
     int XClearWindow(Display *d, Window w)
 }
-declare 85 aqua {
+declare 85 macosx {
     int XDrawPoint(Display *display, Drawable d, GC gc, int x, int y)
 }
-declare 86 aqua {
+declare 86 macosx {
     int XDrawPoints(Display *display, Drawable d, GC gc, XPoint *points,
 	    int npoints, int mode)
 }
-declare 87 aqua {
+declare 87 macosx {
     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 aqua {
+declare 88 macosx {
     int XQueryColor(Display *display, Colormap colormap, XColor *def_in_out)
 }
-declare 89 aqua {
+declare 89 macosx {
     int XQueryColors(Display *display, Colormap colormap,
 	    XColor *defs_in_out, int ncolors)
 }
-declare 90 aqua {
+declare 90 macosx {
     Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3,
 	    Window **w4, unsigned int *ui)
 }
-declare 91 aqua {
+declare 91 macosx {
     int XSync(Display *display, Bool discard)
 }
-declare 107 aqua {
+declare 107 macosx {
     int XFlush(Display *display)
 }
-declare 108 aqua {
+declare 108 macosx {
     int XGrabServer(Display *display)
 }
-declare 109 aqua {
+declare 109 macosx {
     int XUngrabServer(Display *display)
 }
-declare 110 aqua {
+declare 110 macosx {
     int XFree(void *data)
 }
-declare 111 aqua {
+declare 111 macosx {
     int XNoOp(Display *display)
 }
-declare 112 aqua {
+declare 112 macosx {
     XAfterFunction XSynchronize(Display *display, Bool onoff)
 }
-declare 114 aqua {
+declare 114 macosx {
     VisualID XVisualIDFromVisual(Visual *visual)
 }
-declare 137 aqua {
+declare 120 macosx {
+    int XOffsetRegion(Region rgn, int dx, int dy)
+}
+declare 121 macosx {
+    int XUnionRegion(Region srca, Region srcb, Region dr_return)
+}
+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)
+}
+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 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)
+}
+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 144 macosx {
+    void XDestroyIC(XIC xic)
+}
+declare 145 macosx {
+    Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
+	    XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2)
+}
+declare 146 macosx {
+    Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2,
+	    unsigned int ui1, unsigned int ui2, XColor _Xconst *x1,
+	    XColor _Xconst *x2)
+}
 
 # Local Variables:
 # mode: tcl