diff options
| author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2012-06-05 04:46:39 (GMT) |
|---|---|---|
| committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2012-06-05 04:46:39 (GMT) |
| commit | 7c71b9deca33776e1ac03f3cf30824b338e82afa (patch) | |
| tree | 4b1b6848a2a8f1b3f66d319e784c6d08ddc042ab /xlib | |
| parent | 171f9bb65d102fe4110b445c82235472acd60fa1 (diff) | |
| parent | 9c44bc5eed930f68be46b28a8c917706c79daab6 (diff) | |
| download | tk-7c71b9deca33776e1ac03f3cf30824b338e82afa.zip tk-7c71b9deca33776e1ac03f3cf30824b338e82afa.tar.gz tk-7c71b9deca33776e1ac03f3cf30824b338e82afa.tar.bz2 | |
Change XSetDashes signature and many others to match Xorg, needed for Cygwin
Diffstat (limited to 'xlib')
| -rw-r--r-- | xlib/xdraw.c | 8 | ||||
| -rw-r--r-- | xlib/xgc.c | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/xlib/xdraw.c b/xlib/xdraw.c index f8f035c..b8d7973 100644 --- a/xlib/xdraw.c +++ b/xlib/xdraw.c @@ -27,7 +27,7 @@ *---------------------------------------------------------------------- */ -void +int XDrawLine( Display *display, Drawable d, @@ -41,7 +41,7 @@ XDrawLine( points[0].y = y1; points[1].x = x2; points[1].y = y2; - XDrawLines(display, d, gc, points, 2, CoordModeOrigin); + return XDrawLines(display, d, gc, points, 2, CoordModeOrigin); } /* @@ -61,7 +61,7 @@ XDrawLine( *---------------------------------------------------------------------- */ -void +int XFillRectangle( Display *display, Drawable d, @@ -76,7 +76,7 @@ XFillRectangle( rectangle.y = y; rectangle.width = width; rectangle.height = height; - XFillRectangles(display, d, gc, &rectangle, 1); + return XFillRectangles(display, d, gc, &rectangle, 1); } /* @@ -24,6 +24,7 @@ # define Region XRegion #endif +#undef TkSetRegion /* *---------------------------------------------------------------------- @@ -43,7 +44,7 @@ static TkpClipMask *AllocClipMask(GC gc) { TkpClipMask *clip_mask = (TkpClipMask*) gc->clip_mask; - + if (clip_mask == None) { clip_mask = (TkpClipMask*) ckalloc(sizeof(TkpClipMask)); gc->clip_mask = (Pixmap) clip_mask; @@ -154,7 +155,7 @@ XCreateGC( gp->clip_mask = None; if (mask & GCClipMask) { TkpClipMask *clip_mask = AllocClipMask(gp); - + clip_mask->type = TKP_CLIP_PIXMAP; clip_mask->value.pixmap = values->clip_mask; } @@ -279,7 +280,7 @@ XSetBackground( gc->background = background; } -void +int XSetDashes( Display *display, GC gc, @@ -301,6 +302,7 @@ XSetDashes( *p++ = *dash_list++; } *p = 0; + return Success; } void |