diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-09-16 13:31:53 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-09-16 13:31:53 (GMT) |
| commit | d980ba34a2945ea7e24465358c45037f718f745f (patch) | |
| tree | 85d07937c0b8ccd483fb826293c1d62e623892f3 /macosx | |
| parent | 2187aab4757979e54f0f3102d4a7a55df72fd975 (diff) | |
| parent | 13889d99405e5b3b703342d59b5478f51cbbd5bd (diff) | |
| download | tk-d980ba34a2945ea7e24465358c45037f718f745f.zip tk-d980ba34a2945ea7e24465358c45037f718f745f.tar.gz tk-d980ba34a2945ea7e24465358c45037f718f745f.tar.bz2 | |
merge 8.5; update changescore_8_5_15core_8_5_15_rc
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXClipboard.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXDraw.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/macosx/tkMacOSXClipboard.c b/macosx/tkMacOSXClipboard.c index 7cd9c30..6ac7830 100644 --- a/macosx/tkMacOSXClipboard.c +++ b/macosx/tkMacOSXClipboard.c @@ -168,6 +168,7 @@ XSetSelectionOwner( changeCount = [pb declareTypes:[NSArray array] owner:NSApp]; } } + return Success; } /* @@ -194,7 +195,6 @@ TkMacOSXSelDeadWindow( if (winPtr && winPtr == (TkWindow *)clipboardOwner) { clipboardOwner = NULL; } - return Success; } /* diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c index 4eb4a88..58ae495 100644 --- a/macosx/tkMacOSXDraw.c +++ b/macosx/tkMacOSXDraw.c @@ -347,6 +347,7 @@ TkPutImage( TkMacOSXDbgMsg("Invalid destination drawable"); } TkMacOSXRestoreDrawingContext(&dc); + return Success; } /* @@ -744,7 +745,6 @@ DrawCGImage( } else { TkMacOSXDbgMsg("Drawing of empty CGImage requested"); } - return Success; } /* |