summaryrefslogtreecommitdiff
path: root/src/os/macosx
diff options
context:
space:
mode:
Diffstat (limited to 'src/os/macosx')
-rw-r--r--src/os/macosx/macos.mm4
-rw-r--r--src/os/macosx/osx_stdafx.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/os/macosx/macos.mm b/src/os/macosx/macos.mm
index 6f0ab8d63..90bcd6dc4 100644
--- a/src/os/macosx/macos.mm
+++ b/src/os/macosx/macos.mm
@@ -191,13 +191,13 @@ const char *GetCurrentLocale(const char *)
bool GetClipboardContents(char *buffer, const char *last)
{
NSPasteboard *pb = [ NSPasteboard generalPasteboard ];
- NSArray *types = [ NSArray arrayWithObject:NSStringPboardType ];
+ NSArray *types = [ NSArray arrayWithObject:NSPasteboardTypeString ];
NSString *bestType = [ pb availableTypeFromArray:types ];
/* Clipboard has no text data available. */
if (bestType == nil) return false;
- NSString *string = [ pb stringForType:NSStringPboardType ];
+ NSString *string = [ pb stringForType:NSPasteboardTypeString ];
if (string == nil || [ string length ] == 0) return false;
strecpy(buffer, [ string UTF8String ], last);
diff --git a/src/os/macosx/osx_stdafx.h b/src/os/macosx/osx_stdafx.h
index e147fcf74..9c4276d05 100644
--- a/src/os/macosx/osx_stdafx.h
+++ b/src/os/macosx/osx_stdafx.h
@@ -26,6 +26,10 @@
#define HAVE_OSX_1011_SDK
#endif
+#ifdef MAC_OS_X_VERSION_10_12
+#define HAVE_OSX_1012_SDK
+#endif
+
/* It would seem that to ensure backward compatibility we have to ensure that we have defined MAC_OS_X_VERSION_10_x everywhere */
#ifndef MAC_OS_X_VERSION_10_3
#define MAC_OS_X_VERSION_10_3 1030