diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-18 21:55:51 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-18 21:55:51 (GMT) |
commit | 4efa3179d5ee036975a86e6ce5986f305651b45d (patch) | |
tree | b25183d5923d60c27cc257ad57307cf2500bc8bd /macosx/tkMacOSXDraw.c | |
parent | 452f3387dfdfe45cb1fc59b28657e5111a2778d8 (diff) | |
parent | 416295a661f5c8f30dfe0751b5618c6a51173034 (diff) | |
download | tk-4efa3179d5ee036975a86e6ce5986f305651b45d.zip tk-4efa3179d5ee036975a86e6ce5986f305651b45d.tar.gz tk-4efa3179d5ee036975a86e6ce5986f305651b45d.tar.bz2 |
Merge 8.6
Diffstat (limited to 'macosx/tkMacOSXDraw.c')
-rw-r--r-- | macosx/tkMacOSXDraw.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c index f985931..ef57265 100644 --- a/macosx/tkMacOSXDraw.c +++ b/macosx/tkMacOSXDraw.c @@ -906,7 +906,7 @@ XFillPolygon( *---------------------------------------------------------------------- */ -void +int XDrawRectangle( Display *display, /* Display. */ Drawable d, /* Draw on this. */ @@ -920,12 +920,12 @@ XDrawRectangle( int lw = gc->line_width; if (width == 0 || height == 0) { - return; + return BadDrawable; } display->request++; if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) { - return; + return BadDrawable; } if (dc.context) { CGRect rect; @@ -937,6 +937,7 @@ XDrawRectangle( CGContextStrokeRect(dc.context, rect); } TkMacOSXRestoreDrawingContext(&dc); + return Success; } #ifdef TK_MACOSXDRAW_UNUSED @@ -1266,7 +1267,7 @@ XDrawArcs( *---------------------------------------------------------------------- */ -void +int XFillArc( Display *display, /* Display. */ Drawable d, /* Draw on this. */ @@ -1282,12 +1283,12 @@ XFillArc( int lw = gc->line_width; if (width == 0 || height == 0 || angle2 == 0) { - return; + return BadDrawable; } display->request++; if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) { - return; + return BadDrawable; } if (dc.context) { CGRect rect; |