diff options
| author | Alan Third | 2019-04-02 21:49:36 +0100 |
|---|---|---|
| committer | Alan Third | 2019-05-21 20:57:33 +0100 |
| commit | 9624f609493da7c08016ba00d6895bad0fe26a0e (patch) | |
| tree | 766d6c8f60ad8e4d3053502de12634f960717e39 /src/nsselect.m | |
| parent | cb367c8e0d4a881acf8255e1ff6bdd6442efb538 (diff) | |
| download | emacs-9624f609493da7c08016ba00d6895bad0fe26a0e.tar.gz emacs-9624f609493da7c08016ba00d6895bad0fe26a0e.zip | |
Fix some deprecation notices on macOS 10.14
* src/nsimage.m ([EmacsImage setXBMColor:]): Replace colorSpaceName
code.
* src/nsmenu.m ([EmacsDialogPanel initWithContentRect:styleMask:]):
Remove reference to oneShot.
* src/nsterm.h (ns_enable_screen_updates): Remove function prototype.
(NSPasteboardTypeString):
(NSPasteboardTypeTabularText):
(NSControlStateValueOn):
(NSControlStateValueOff):
(NSBezelStyleRounded):
(NSPasteboardTypeURL): Define new names and replace all callers.
* src/nsterm.m ([EmacsColor colorUsingDefaultColorSpace]): Replace
calls to colorUsingColorSpaceName on macOS > 10.7.
([EmacsView performDragOperation:]): Add FIXME about deprecation.
(ns_disable_screen_updates):
(ns_enable_screen_updates): Remove functions and all callers.
(disable_screen_updates_count): Remove variable.
* src/macfont.m (macfont_draw): Use CGContext instead of graphicsPort
on macOS >= 10.10
Diffstat (limited to 'src/nsselect.m')
| -rw-r--r-- | src/nsselect.m | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nsselect.m b/src/nsselect.m index cf36c869eb1..b044fe6f32d 100644 --- a/src/nsselect.m +++ b/src/nsselect.m | |||
| @@ -57,7 +57,7 @@ symbol_to_nsstring (Lisp_Object sym) | |||
| 57 | if (EQ (sym, QCLIPBOARD)) return NSPasteboardNameGeneral; | 57 | if (EQ (sym, QCLIPBOARD)) return NSPasteboardNameGeneral; |
| 58 | if (EQ (sym, QPRIMARY)) return NXPrimaryPboard; | 58 | if (EQ (sym, QPRIMARY)) return NXPrimaryPboard; |
| 59 | if (EQ (sym, QSECONDARY)) return NXSecondaryPboard; | 59 | if (EQ (sym, QSECONDARY)) return NXSecondaryPboard; |
| 60 | if (EQ (sym, QTEXT)) return NSStringPboardType; | 60 | if (EQ (sym, QTEXT)) return NSPasteboardTypeString; |
| 61 | return [NSString stringWithUTF8String: SSDATA (SYMBOL_NAME (sym))]; | 61 | return [NSString stringWithUTF8String: SSDATA (SYMBOL_NAME (sym))]; |
| 62 | } | 62 | } |
| 63 | 63 | ||
| @@ -76,11 +76,11 @@ ns_string_to_symbol (NSString *t) | |||
| 76 | return QPRIMARY; | 76 | return QPRIMARY; |
| 77 | if ([t isEqualToString: NXSecondaryPboard]) | 77 | if ([t isEqualToString: NXSecondaryPboard]) |
| 78 | return QSECONDARY; | 78 | return QSECONDARY; |
| 79 | if ([t isEqualToString: NSStringPboardType]) | 79 | if ([t isEqualToString: NSPasteboardTypeString]) |
| 80 | return QTEXT; | 80 | return QTEXT; |
| 81 | if ([t isEqualToString: NSFilenamesPboardType]) | 81 | if ([t isEqualToString: NSFilenamesPboardType]) |
| 82 | return QFILE_NAME; | 82 | return QFILE_NAME; |
| 83 | if ([t isEqualToString: NSTabularTextPboardType]) | 83 | if ([t isEqualToString: NSPasteboardTypeTabularText]) |
| 84 | return QTEXT; | 84 | return QTEXT; |
| 85 | return intern ([t UTF8String]); | 85 | return intern ([t UTF8String]); |
| 86 | } | 86 | } |
| @@ -193,7 +193,7 @@ ns_string_to_pasteboard_internal (id pb, Lisp_Object str, NSString *gtype) | |||
| 193 | else | 193 | else |
| 194 | { | 194 | { |
| 195 | // Used for ns-own-selection-internal. | 195 | // Used for ns-own-selection-internal. |
| 196 | eassert (gtype == NSStringPboardType); | 196 | eassert (gtype == NSPasteboardTypeString); |
| 197 | [pb setString: nsStr forType: gtype]; | 197 | [pb setString: nsStr forType: gtype]; |
| 198 | } | 198 | } |
| 199 | [nsStr release]; | 199 | [nsStr release]; |
| @@ -345,7 +345,7 @@ anything that the functions on `selection-converter-alist' know about. */) | |||
| 345 | } | 345 | } |
| 346 | 346 | ||
| 347 | /* We only support copy of text. */ | 347 | /* We only support copy of text. */ |
| 348 | type = NSStringPboardType; | 348 | type = NSPasteboardTypeString; |
| 349 | target_symbol = ns_string_to_symbol (type); | 349 | target_symbol = ns_string_to_symbol (type); |
| 350 | if (STRINGP (value)) | 350 | if (STRINGP (value)) |
| 351 | { | 351 | { |
| @@ -472,9 +472,9 @@ nxatoms_of_nsselect (void) | |||
| 472 | [NSNumber numberWithLong:0], NSPasteboardNameGeneral, | 472 | [NSNumber numberWithLong:0], NSPasteboardNameGeneral, |
| 473 | [NSNumber numberWithLong:0], NXPrimaryPboard, | 473 | [NSNumber numberWithLong:0], NXPrimaryPboard, |
| 474 | [NSNumber numberWithLong:0], NXSecondaryPboard, | 474 | [NSNumber numberWithLong:0], NXSecondaryPboard, |
| 475 | [NSNumber numberWithLong:0], NSStringPboardType, | 475 | [NSNumber numberWithLong:0], NSPasteboardTypeString, |
| 476 | [NSNumber numberWithLong:0], NSFilenamesPboardType, | 476 | [NSNumber numberWithLong:0], NSFilenamesPboardType, |
| 477 | [NSNumber numberWithLong:0], NSTabularTextPboardType, | 477 | [NSNumber numberWithLong:0], NSPasteboardTypeTabularText, |
| 478 | nil] retain]; | 478 | nil] retain]; |
| 479 | } | 479 | } |
| 480 | 480 | ||