diff options
| author | dgp <dgp@noemail.net> | 2013-09-16 13:31:53 (GMT) |
|---|---|---|
| committer | dgp <dgp@noemail.net> | 2013-09-16 13:31:53 (GMT) |
| commit | 2b467e2e3204977204995762b9ccf3e7140d1b6f (patch) | |
| tree | 85d07937c0b8ccd483fb826293c1d62e623892f3 | |
| parent | 1445a81340a6ba18e565d4942b3a724ef449984b (diff) | |
| parent | 7fd16283100ed0afe552776c1a37b72462b3e09f (diff) | |
| download | tk-2b467e2e3204977204995762b9ccf3e7140d1b6f.zip tk-2b467e2e3204977204995762b9ccf3e7140d1b6f.tar.gz tk-2b467e2e3204977204995762b9ccf3e7140d1b6f.tar.bz2 | |
merge 8.5; update changescore-8-5-15
FossilOrigin-Name: a1861dff67d74660f3bcfca992c1eb54c707bb64
| -rw-r--r-- | changes | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXClipboard.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXDraw.c | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -6908,4 +6908,6 @@ Many revisions to better support a Cygwin environment (nijtmans) 2013-08-26 (bug fix)[c597acd] [$pb step] work with traces (english) ---- Released 8.5.15, September 16, 2013 --- http://core.tcl.tk/tk/ for details +2013-09-15 (bug fix)[8eb5671] macosx Tk compile errors w/clang (deily) + +--- Released 8.5.15, September 18, 2013 --- http://core.tcl.tk/tk/ for details 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; } /* |