diff options
author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-06-11 08:06:56 (GMT) |
---|---|---|
committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-06-11 08:06:56 (GMT) |
commit | 1c088c317f2e745d9cb6d114e8dd95a94ef8700f (patch) | |
tree | 641629368b0c8ca47b03cb3098e7abafcf34528e /macosx | |
parent | 793eef48e4b6d7e97c23a87b23687a756cf98482 (diff) | |
download | tk-1c088c317f2e745d9cb6d114e8dd95a94ef8700f.zip tk-1c088c317f2e745d9cb6d114e8dd95a94ef8700f.tar.gz tk-1c088c317f2e745d9cb6d114e8dd95a94ef8700f.tar.bz2 |
Fix broken commits so function definitions match declarations and returns are
of values that should be produced.
Diffstat (limited to 'macosx')
-rw-r--r-- | macosx/tkMacOSXClipboard.c | 3 | ||||
-rw-r--r-- | macosx/tkMacOSXDraw.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/macosx/tkMacOSXClipboard.c b/macosx/tkMacOSXClipboard.c index d1f1baa..92d6590 100644 --- a/macosx/tkMacOSXClipboard.c +++ b/macosx/tkMacOSXClipboard.c @@ -198,14 +198,13 @@ XSetSelectionOwner( *---------------------------------------------------------------------- */ -int +void TkMacOSXSelDeadWindow( TkWindow *winPtr) { if (winPtr && winPtr == (TkWindow *)clipboardOwner) { clipboardOwner = NULL; } - return Success; } /* diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c index 9a49790..fd73b96 100644 --- a/macosx/tkMacOSXDraw.c +++ b/macosx/tkMacOSXDraw.c @@ -348,6 +348,7 @@ TkPutImage( TkMacOSXDbgMsg("Invalid destination drawable"); } TkMacOSXRestoreDrawingContext(&dc); + return Success; } /* @@ -731,7 +732,8 @@ DrawCGImage( dstBounds.size.width, dstBounds.size.height); #else /* TK_MAC_DEBUG_IMAGE_DRAWING */ CGContextSaveGState(context); - CGContextTranslateCTM(context, 0, dstBounds.origin.y + CGRectGetMaxY(dstBounds)); + CGContextTranslateCTM(context, + 0, dstBounds.origin.y + CGRectGetMaxY(dstBounds)); CGContextScaleCTM(context, 1, -1); CGContextDrawImage(context, dstBounds, image); CGContextRestoreGState(context); @@ -745,7 +747,6 @@ DrawCGImage( } else { TkMacOSXDbgMsg("Drawing of empty CGImage requested"); } - return Success; } /* |