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/nsimage.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/nsimage.m')
| -rw-r--r-- | src/nsimage.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsimage.m b/src/nsimage.m index 33236c48d42..0249d22acae 100644 --- a/src/nsimage.m +++ b/src/nsimage.m @@ -313,8 +313,8 @@ ns_set_alpha (void *img, int x, int y, unsigned char a) if (bmRep == nil || color == nil) return self; - if ([color colorSpaceName] != NSCalibratedRGBColorSpace) - rgbColor = [color colorUsingColorSpaceName: NSCalibratedRGBColorSpace]; + if ([color colorSpace] != [NSColorSpace deviceRGBColorSpace]) + rgbColor = [color colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; else rgbColor = color; |