zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

This commit is contained in:
Christoph Oelckers 2016-01-17 18:36:50 +01:00
parent c611456397 2702e68d83
commit be91771abc
3 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/posix/cocoa/i_system.mm
View File

@ -338,23 +338,17 @@ int I_FindAttr(findstate_t* const fileinfo)
}
static NSString* GetPasteboardStringType()
{
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
return NSStringPboardType;
#else // 10.6 or higher
return NSAppKitVersionNumber < AppKit10_6
? NSStringPboardType
: NSPasteboardTypeString;
#endif // before 10.6
}
void I_PutInClipboard(const char* const string)
{
NSPasteboard* const pasteBoard = [NSPasteboard generalPasteboard];
[pasteBoard clearContents];
[pasteBoard setString:[NSString stringWithUTF8String:string]
forType:GetPasteboardStringType()];
NSString* const stringType = NSStringPboardType;
NSArray* const types = [NSArray arrayWithObjects:stringType, nil];
NSString* const content = [NSString stringWithUTF8String:string];
[pasteBoard declareTypes:types
owner:nil];
[pasteBoard setString:content
forType:stringType];
}
FString I_GetFromClipboard(bool returnNothing)
@ -365,7 +359,7 @@ FString I_GetFromClipboard(bool returnNothing)
}
NSPasteboard* const pasteBoard = [NSPasteboard generalPasteboard];
NSString* const value = [pasteBoard stringForType:GetPasteboardStringType()];
NSString* const value = [pasteBoard stringForType:NSStringPboardType];
return FString([value UTF8String]);
}

1
src/posix/cocoa/st_console.h
View File

@ -85,7 +85,6 @@ private:
int m_netMaxPos;
FConsoleWindow();
~FConsoleWindow();
void ExpandTextView(float height);

5
src/posix/cocoa/st_console.mm
View File

@ -118,11 +118,6 @@ FConsoleWindow::FConsoleWindow()
[m_window makeKeyAndOrderFront:nil];
}
FConsoleWindow::~FConsoleWindow()
{
[m_window close];
}
static FConsoleWindow* s_instance;