sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cocoa port : Fix bugs in clipboard operations

Browse Source
This commit is contained in:
Damien Plisson 2009-10-05 15:00:07 +00:00
parent 3816554cbc
commit 77b8be6e13
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
intern/ghost/intern/GHOST_SystemCocoa.mm
View File

@ -1271,7 +1271,7 @@ GHOST_TUns8* GHOST_SystemCocoa::getClipboard(bool selection) const
NSPasteboard *pasteBoard = [NSPasteboard generalPasteboard];
if (pasteBoard = nil) {
if (pasteBoard == nil) {
[pool drain];
return NULL;
}
@ -1289,11 +1289,19 @@ GHOST_TUns8* GHOST_SystemCocoa::getClipboard(bool selection) const
NSString * textPasted = [pasteBoard stringForType:@"public.utf8-plain-text"];
if (textPasted == nil) {
[pool drain];
return NULL;
}
pastedTextSize = [textPasted lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
temp_buff = (GHOST_TUns8*) malloc(pastedTextSize+1);
if (temp_buff == NULL) return NULL;
if (temp_buff == NULL) {
[pool drain];
return NULL;
}
strncpy((char*)temp_buff, [textPasted UTF8String], pastedTextSize);
@ -1318,12 +1326,12 @@ void GHOST_SystemCocoa::putClipboard(GHOST_TInt8 *buffer, bool selection) const
NSPasteboard *pasteBoard = [NSPasteboard generalPasteboard];
if (pasteBoard = nil) {
if (pasteBoard == nil) {
[pool drain];
return;
}
NSArray *supportedTypes = [NSArray arrayWithObjects: @"public.utf8-plain-text",nil];
NSArray *supportedTypes = [NSArray arrayWithObject:@"public.utf8-plain-text"];
[pasteBoard declareTypes:supportedTypes owner:nil];