diff options
Diffstat (limited to 'win/tkWinDraw.c')
| -rwxr-xr-x | win/tkWinDraw.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/win/tkWinDraw.c b/win/tkWinDraw.c index fea17d3..9bdeec1 100755 --- a/win/tkWinDraw.c +++ b/win/tkWinDraw.c @@ -117,7 +117,7 @@ static Tcl_ThreadDataKey dataKey; static POINT * ConvertPoints _ANSI_ARGS_((XPoint *points, int npoints, int mode, RECT *bbox)); -static void DrawOrFillArc _ANSI_ARGS_((Display *display, +static int DrawOrFillArc _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height, int start, int extent, int fill)); @@ -299,7 +299,7 @@ ConvertPoints(points, npoints, mode, bbox) *---------------------------------------------------------------------- */ -void +int XCopyArea(display, src, dest, gc, src_x, src_y, width, height, dest_x, dest_y) Display* display; Drawable src; @@ -335,6 +335,7 @@ XCopyArea(display, src, dest, gc, src_x, src_y, width, height, dest_x, dest_y) TkWinReleaseDrawableDC(dest, destDC, &destState); } TkWinReleaseDrawableDC(src, srcDC, &srcState); + return 0; } /* @@ -356,7 +357,7 @@ XCopyArea(display, src, dest, gc, src_x, src_y, width, height, dest_x, dest_y) *---------------------------------------------------------------------- */ -void +int XCopyPlane(display, src, dest, gc, src_x, src_y, width, height, dest_x, dest_y, plane) Display* display; @@ -486,6 +487,7 @@ XCopyPlane(display, src, dest, gc, src_x, src_y, width, height, dest_x, TkWinReleaseDrawableDC(dest, destDC, &destState); } TkWinReleaseDrawableDC(src, srcDC, &srcState); + return 0; } /* @@ -916,7 +918,7 @@ XDrawLines(display, d, gc, points, npoints, mode) *---------------------------------------------------------------------- */ -void +int XFillPolygon(display, d, gc, points, npoints, shape, mode) Display* display; Drawable d; @@ -931,7 +933,7 @@ XFillPolygon(display, d, gc, points, npoints, shape, mode) HDC dc; if (d == None) { - return; + return 0; } dc = TkWinGetDrawableDC(display, d, &state); @@ -940,6 +942,7 @@ XFillPolygon(display, d, gc, points, npoints, shape, mode) RenderObject(dc, gc, points, npoints, mode, pen, Polygon); TkWinReleaseDrawableDC(d, dc, &state); + return 0; } /* @@ -958,7 +961,7 @@ XFillPolygon(display, d, gc, points, npoints, shape, mode) *---------------------------------------------------------------------- */ -void +int XDrawRectangle(display, d, gc, x, y, width, height) Display* display; Drawable d; @@ -974,7 +977,7 @@ XDrawRectangle(display, d, gc, x, y, width, height) HDC dc; if (d == None) { - return; + return 0; } dc = TkWinGetDrawableDC(display, d, &state); @@ -990,6 +993,7 @@ XDrawRectangle(display, d, gc, x, y, width, height) DeleteObject(SelectObject(dc, oldPen)); SelectObject(dc, oldBrush); TkWinReleaseDrawableDC(d, dc, &state); + return 0; } /* @@ -1008,7 +1012,7 @@ XDrawRectangle(display, d, gc, x, y, width, height) *---------------------------------------------------------------------- */ -void +int XDrawArc(display, d, gc, x, y, width, height, start, extent) Display* display; Drawable d; @@ -1022,7 +1026,7 @@ XDrawArc(display, d, gc, x, y, width, height, start, extent) { display->request++; - DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, 0); + return DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, 0); } /* @@ -1041,7 +1045,7 @@ XDrawArc(display, d, gc, x, y, width, height, start, extent) *---------------------------------------------------------------------- */ -void +int XFillArc(display, d, gc, x, y, width, height, start, extent) Display* display; Drawable d; @@ -1055,7 +1059,7 @@ XFillArc(display, d, gc, x, y, width, height, start, extent) { display->request++; - DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, 1); + return DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, 1); } /* @@ -1075,7 +1079,7 @@ XFillArc(display, d, gc, x, y, width, height, start, extent) *---------------------------------------------------------------------- */ -static void +static int DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, fill) Display *display; Drawable d; @@ -1095,7 +1099,7 @@ DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, fill) double radian_start, radian_end, xr, yr; if (d == None) { - return; + return 0; } dc = TkWinGetDrawableDC(display, d, &state); @@ -1165,6 +1169,7 @@ DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, fill) } DeleteObject(SelectObject(dc, oldPen)); TkWinReleaseDrawableDC(d, dc, &state); + return 0; } /* |