Change XSetDashes signature and many others to match Xorg, needed for Cygwin

1 files changed, 34 insertions, 33 deletions

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 20d0dd4..f08c046 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -975,7 +975,7 @@ interface tkIntXlib
 # X functions for Windows
 
 declare 0 win {
-    void XSetDashes(Display *display, GC gc, int dash_offset,
+    int XSetDashes(Display *display, GC gc, int dash_offset,
 	    _Xconst char *dash_list, int n)
 }
 declare 1 win {
@@ -1005,7 +1005,8 @@ declare 7 win {
 }
 declare 8 win {
     Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2,
-	    unsigned int ui1, unsigned int ui2, XColor *x1, XColor *x2)
+	    unsigned int ui1, unsigned int ui2, XColor _Xconst *x1,
+	    XColor _Xconst *x2)
 }
 declare 9 win {
     GContext XGContextFromGC(GC g)
@@ -1039,7 +1040,7 @@ declare 18 win {
     Status XAllocColor(Display *d, Colormap c, XColor *xp)
 }
 declare 19 win {
-    void XBell(Display *d, int i)
+    int XBell(Display *d, int i)
 }
 declare 20 win {
     void XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1,
@@ -1070,7 +1071,7 @@ declare 26 win {
 	    _Xconst char *data, unsigned int width, unsigned int height)
 }
 declare 27 win {
-    void XDefineCursor(Display *d, Window w, Cursor c)
+    int XDefineCursor(Display *d, Window w, Cursor c)
 }
 declare 28 win {
     void XDeleteProperty(Display *d, Window w, Atom a)
@@ -1083,7 +1084,7 @@ declare 30 win {
 	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
 declare 31 win {
-    void XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)
+    int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)
 }
 declare 32 win {
     void XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2,
@@ -1098,23 +1099,23 @@ declare 34 win {
 	    int i1, int i2, int i3)
 }
 declare 35 win {
-    void XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i)
+    int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i)
 }
 declare 36 win {
     void XForceScreenSaver(Display *d, int i)
 }
 declare 37 win {
-    void XFreeColormap(Display *d, Colormap c)
+    int XFreeColormap(Display *d, Colormap c)
 }
 declare 38 win {
-    void XFreeColors(Display *d, Colormap c,
+    int XFreeColors(Display *d, Colormap c,
 	    unsigned long *ulp, int i, unsigned long ul)
 }
 declare 39 win {
     void XFreeCursor(Display *d, Cursor c)
 }
 declare 40 win {
-    void XFreeModifiermap(XModifierKeymap *x)
+    int XFreeModifiermap(XModifierKeymap *x)
 }
 declare 41 win {
     Status XGetGeometry(Display *d, Drawable dr, Window *w, int *i1,
@@ -1190,7 +1191,7 @@ declare 61 win {
     Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x)
 }
 declare 62 win {
-    void XSetCommand(Display *d, Window w, char **c, int i)
+    int XSetCommand(Display *d, Window w, char **c, int i)
 }
 declare 63 win {
     void XSetIconName(Display *d, Window w, _Xconst char *c)
@@ -1199,7 +1200,7 @@ declare 64 win {
     void XSetInputFocus(Display *d, Window w, int i, Time t)
 }
 declare 65 win {
-    void XSetSelectionOwner(Display *d, Atom a, Window w, Time t)
+    int XSetSelectionOwner(Display *d, Atom a, Window w, Time t)
 }
 declare 66 win {
     void XSetWindowBackground(Display *d, Window w, unsigned long ul)
@@ -1227,7 +1228,7 @@ declare 73 win {
     void XUngrabKeyboard(Display *d, Time t)
 }
 declare 74 win {
-    void XUngrabPointer(Display *d, Time t)
+    int XUngrabPointer(Display *d, Time t)
 }
 declare 75 win {
     void XUnmapWindow(Display *d, Window w)
@@ -1246,7 +1247,7 @@ declare 79 win {
 	    KeySym *k, Status *s)
 }
 declare 80 win {
-    void TkPutImage(unsigned long *colors, int ncolors, Display *display,
+    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)
 }
@@ -1332,23 +1333,23 @@ declare 103 win {
 	    XTextProperty *text_prop_return)
 }
 declare 104 win {
-    void XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1,
+    int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1,
 	    int x2, int y2)
 }
-declare 106 win {
-    void XFillRectangle(Display *display, Drawable d, GC gc,
-	    int x, int y, unsigned int width, unsigned int height)
-}
 declare 105 win {
-    void XWarpPointer(Display *d, Window s, Window dw, int sx, int sy,
+    int XWarpPointer(Display *d, Window s, Window dw, int sx, int sy,
 	    unsigned int sw, unsigned int sh, int dx, int dy)
 }
+declare 106 win {
+    int XFillRectangle(Display *display, Drawable d, GC gc,
+	    int x, int y, unsigned int width, unsigned int height)
+}
 
 ################################
 # X functions for Aqua
 
 declare 0 aqua {
-    void XSetDashes(Display *display, GC gc, int dash_offset,
+    int XSetDashes(Display *display, GC gc, int dash_offset,
 	    _Xconst char *dash_list, int n)
 }
 declare 1 aqua {
@@ -1391,7 +1392,7 @@ declare 12 aqua {
     Status XAllocColor(Display *d, Colormap c, XColor *xp)
 }
 declare 13 aqua {
-    void XBell(Display *d, int i)
+    int XBell(Display *d, int i)
 }
 declare 14 aqua {
     void XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1,
@@ -1419,7 +1420,7 @@ declare 19 aqua {
 	    _Xconst char *data, unsigned int width, unsigned int height)
 }
 declare 20 aqua {
-    void XDefineCursor(Display *d, Window w, Cursor c)
+    int XDefineCursor(Display *d, Window w, Cursor c)
 }
 declare 21 aqua {
     void XDestroyWindow(Display *d, Window w)
@@ -1429,7 +1430,7 @@ declare 22 aqua {
 	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
 declare 23 aqua {
-    void XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)
+    int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)
 }
 declare 24 aqua {
     void XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2,
@@ -1444,17 +1445,17 @@ declare 26 aqua {
 	    int i1, int i2, int i3)
 }
 declare 27 aqua {
-    void XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i)
+    int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i)
 }
 declare 28 aqua {
-    void XFreeColormap(Display *d, Colormap c)
+    int XFreeColormap(Display *d, Colormap c)
 }
 declare 29 aqua {
-    void XFreeColors(Display *d, Colormap c,
+    int XFreeColors(Display *d, Colormap c,
 	    unsigned long *ulp, int i, unsigned long ul)
 }
 declare 30 aqua {
-    void XFreeModifiermap(XModifierKeymap *x)
+    int XFreeModifiermap(XModifierKeymap *x)
 }
 declare 31 aqua {
     Status XGetGeometry(Display *d, Drawable dr, Window *w, int *i1,
@@ -1513,7 +1514,7 @@ declare 46 aqua {
     void XSetInputFocus(Display *d, Window w, int i, Time t)
 }
 declare 47 aqua {
-    void XSetSelectionOwner(Display *d, Atom a, Window w, Time t)
+    int XSetSelectionOwner(Display *d, Atom a, Window w, Time t)
 }
 declare 48 aqua {
     void XSetWindowBackground(Display *d, Window w, unsigned long ul)
@@ -1537,13 +1538,13 @@ declare 54 aqua {
     void XUngrabKeyboard(Display *d, Time t)
 }
 declare 55 aqua {
-    void XUngrabPointer(Display *d, Time t)
+    int XUngrabPointer(Display *d, Time t)
 }
 declare 56 aqua {
     void XUnmapWindow(Display *d, Window w)
 }
 declare 57 aqua {
-    void TkPutImage(unsigned long *colors, int ncolors, Display *display,
+    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)
 }
@@ -1631,11 +1632,11 @@ declare 81 aqua {
     void XForceScreenSaver(Display *display, int mode)
 }
 declare 82 aqua {
-    void XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1,
+    int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1,
 	    int x2, int y2)
 }
 declare 83 aqua {
-    void XFillRectangle(Display *display, Drawable d, GC gc,
+    int XFillRectangle(Display *display, Drawable d, GC gc,
 	    int x, int y, unsigned int width, unsigned int height)
 }
 declare 84 aqua {
@@ -1649,7 +1650,7 @@ declare 86 aqua {
 	    int npoints, int mode)
 }
 declare 87 aqua {
-    void XWarpPointer(Display *display, Window src_w, Window dest_w,
+    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)
 }