diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-08 12:30:52 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-08 12:30:52 (GMT) |
| commit | 0f2ffed961ac353e176a9666cbc40444ac0c99f9 (patch) | |
| tree | fced1b6ff9ebe3c8c61cc2daf0a7a345a98ee74a /macosx | |
| parent | f0a49fb50d3f9081a6d15ab8a54ea7cfb81b50d8 (diff) | |
| parent | 2140e227e9409b50834e84b180e1d3cb4a9d0ecc (diff) | |
| download | tk-0f2ffed961ac353e176a9666cbc40444ac0c99f9.zip tk-0f2ffed961ac353e176a9666cbc40444ac0c99f9.tar.gz tk-0f2ffed961ac353e176a9666cbc40444ac0c99f9.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXDraw.c | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXWindowEvent.c | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXXStubs.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c index f85d6ac..474ed41 100644 --- a/macosx/tkMacOSXDraw.c +++ b/macosx/tkMacOSXDraw.c @@ -1695,13 +1695,13 @@ TkMacOSXSetupDrawingContext( CGContextSetTextDrawingMode(dc.context, kCGTextFill); CGContextConcatCTM(dc.context, t); if (dc.clipRgn) { - #ifdef TK_MAC_DEBUG_DRAWING +#ifdef TK_MAC_DEBUG_DRAWING CGContextSaveGState(dc.context); ChkErr(HIShapeReplacePathInCGContext, dc.clipRgn, dc.context); CGContextSetRGBFillColor(dc.context, 1.0, 0.0, 0.0, 0.1); CGContextEOFillPath(dc.context); CGContextRestoreGState(dc.context); - #endif /* TK_MAC_DEBUG_DRAWING */ +#endif /* TK_MAC_DEBUG_DRAWING */ CGRect r; if (!HIShapeIsRectangular(dc.clipRgn) || !CGRectContainsRect( *HIShapeGetBounds(dc.clipRgn, &r), diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index 461a94c..a669a8a 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -364,10 +364,10 @@ GenerateUpdates( event.xexpose.count = 0; Tk_HandleEvent(&event); - #ifdef TK_MAC_DEBUG_DRAWING +#ifdef TK_MAC_DEBUG_DRAWING NSLog(@"Expose %p {{%d, %d}, {%d, %d}}", event.xany.window, event.xexpose.x, event.xexpose.y, event.xexpose.width, event.xexpose.height); - #endif +#endif /* * Generate updates for the children of this window diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c index 1313c9f..2251b8f 100644 --- a/macosx/tkMacOSXXStubs.c +++ b/macosx/tkMacOSXXStubs.c @@ -528,7 +528,7 @@ XClearWindow( } /* -void +int XDrawPoint( Display* display, Drawable d, @@ -538,7 +538,7 @@ XDrawPoint( { } -void +int XDrawPoints( Display* display, Drawable d, |