diff options
| author | Alan Third <alan@idiocy.org> | 2019-04-02 21:49:36 +0100 |
|---|---|---|
| committer | Alan Third <alan@idiocy.org> | 2019-05-21 20:57:33 +0100 |
| commit | 9624f609493da7c08016ba00d6895bad0fe26a0e (patch) | |
| tree | 766d6c8f60ad8e4d3053502de12634f960717e39 /src/nsselect.m | |
| parent | cb367c8e0d4a881acf8255e1ff6bdd6442efb538 (diff) | |
| download | emacs-9624f609493da7c08016ba00d6895bad0fe26a0e.tar.gz | |
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) if (EQ (sym, QCLIPBOARD)) return NSPasteboardNameGeneral; if (EQ (sym, QPRIMARY)) return NXPrimaryPboard; if (EQ (sym, QSECONDARY)) return NXSecondaryPboard; - if (EQ (sym, QTEXT)) return NSStringPboardType; + if (EQ (sym, QTEXT)) return NSPasteboardTypeString; return [NSString stringWithUTF8String: SSDATA (SYMBOL_NAME (sym))]; } @@ -76,11 +76,11 @@ ns_string_to_symbol (NSString *t) return QPRIMARY; if ([t isEqualToString: NXSecondaryPboard]) return QSECONDARY; - if ([t isEqualToString: NSStringPboardType]) + if ([t isEqualToString: NSPasteboardTypeString]) return QTEXT; if ([t isEqualToString: NSFilenamesPboardType]) return QFILE_NAME; - if ([t isEqualToString: NSTabularTextPboardType]) + if ([t isEqualToString: NSPasteboardTypeTabularText]) return QTEXT; return intern ([t UTF8String]); } @@ -193,7 +193,7 @@ ns_string_to_pasteboard_internal (id pb, Lisp_Object str, NSString *gtype) else { // Used for ns-own-selection-internal. - eassert (gtype == NSStringPboardType); + eassert (gtype == NSPasteboardTypeString); [pb setString: nsStr forType: gtype]; } [nsStr release]; @@ -345,7 +345,7 @@ anything that the functions on `selection-converter-alist' know about. */) } /* We only support copy of text. */ - type = NSStringPboardType; + type = NSPasteboardTypeString; target_symbol = ns_string_to_symbol (type); if (STRINGP (value)) { @@ -472,9 +472,9 @@ nxatoms_of_nsselect (void) [NSNumber numberWithLong:0], NSPasteboardNameGeneral, [NSNumber numberWithLong:0], NXPrimaryPboard, [NSNumber numberWithLong:0], NXSecondaryPboard, - [NSNumber numberWithLong:0], NSStringPboardType, + [NSNumber numberWithLong:0], NSPasteboardTypeString, [NSNumber numberWithLong:0], NSFilenamesPboardType, - [NSNumber numberWithLong:0], NSTabularTextPboardType, + [NSNumber numberWithLong:0], NSPasteboardTypeTabularText, nil] retain]; } |