diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-05 13:12:04 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-05 13:12:04 (GMT) |
commit | 0f3a2fcdd9d1f4c2d5659ae50ce1a5cba322f62c (patch) | |
tree | e941d8cac470415eab1469160234f7ec7dd217a9 /mac/tkMacClipboard.c | |
parent | fad48a7b6368bdb719b8b5cdc77f19ee4b089ee6 (diff) | |
parent | e35d614587b25a1a03ededdf2d04bcbfca86be70 (diff) | |
download | tk-0f3a2fcdd9d1f4c2d5659ae50ce1a5cba322f62c.zip tk-0f3a2fcdd9d1f4c2d5659ae50ce1a5cba322f62c.tar.gz tk-0f3a2fcdd9d1f4c2d5659ae50ce1a5cba322f62c.tar.bz2 |
merge core-8-4-branchbug_3508771
Diffstat (limited to 'mac/tkMacClipboard.c')
-rw-r--r-- | mac/tkMacClipboard.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mac/tkMacClipboard.c b/mac/tkMacClipboard.c index 953ae23..c25dc69 100644 --- a/mac/tkMacClipboard.c +++ b/mac/tkMacClipboard.c @@ -107,7 +107,7 @@ TkSelGetSelection( *---------------------------------------------------------------------- */ -void +int XSetSelectionOwner( Display* display, /* X Display. */ Atom selection, /* What selection to own. */ @@ -132,11 +132,11 @@ XSetSelectionOwner( */ dispPtr = TkGetMainInfoList()->winPtr->dispPtr; - if (dispPtr->clipboardActive) { - return; + if (!dispPtr->clipboardActive) { + ZeroScrap(); } - ZeroScrap(); } + return Success; } /* |