summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2018-08-15 15:53:14 (GMT)
committerfvogel <fvogelnew1@free.fr>2018-08-15 15:53:14 (GMT)
commitda892056f1127f0825ef0f0569e094bdfb752f65 (patch)
treecde1644b32b817a64dcc403ff0a62df0d7a839f1
parent49572f2f72c35481f39c3fd89be56106a98d814a (diff)
downloadtk-da892056f1127f0825ef0f0569e094bdfb752f65.zip
tk-da892056f1127f0825ef0f0569e094bdfb752f65.tar.gz
tk-da892056f1127f0825ef0f0569e094bdfb752f65.tar.bz2
Revert [b4c5f163] since it breaks paste function with text from another application, see [568827f41c]
-rw-r--r--macosx/tkMacOSXClipboard.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/tkMacOSXClipboard.c b/macosx/tkMacOSXClipboard.c
index 6763a7a..07a8419 100644
--- a/macosx/tkMacOSXClipboard.c
+++ b/macosx/tkMacOSXClipboard.c
@@ -125,8 +125,8 @@ TkSelGetSelection(
int result = TCL_ERROR;
TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
- if (dispPtr && dispPtr->clipboardActive && selection == dispPtr->clipboardAtom
- && (target == XA_STRING || target == dispPtr->utf8Atom)) {
+ if (dispPtr && selection == dispPtr->clipboardAtom && (target == XA_STRING
+ || target == dispPtr->utf8Atom)) {
NSString *string = nil;
NSPasteboard *pb = [NSPasteboard generalPasteboard];
NSString *type = [pb availableTypeFromArray:[NSArray arrayWithObject: