diff options
| author | Alan Third | 2017-03-07 14:45:03 +0000 |
|---|---|---|
| committer | Alan Third | 2017-03-14 14:45:41 +0000 |
| commit | ea5a7f990dc56ab92b04d668fcf72bb330bf2d78 (patch) | |
| tree | 1ffe12f1e05f73a35a00650e0cb26db72e32303a /src/nsimage.m | |
| parent | 19a04b4c327aab2ac7c3089adf891aa8078ef19c (diff) | |
| download | emacs-ea5a7f990dc56ab92b04d668fcf72bb330bf2d78.tar.gz emacs-ea5a7f990dc56ab92b04d668fcf72bb330bf2d78.zip | |
Remove old macOS compatibility code
* src/nsimage.m, src/nsmenu.m, src/nsterm.m: Remove code only for
macOS versions below 10.6 as they are not supported in Emacs 25+.
Diffstat (limited to 'src/nsimage.m')
| -rw-r--r-- | src/nsimage.m | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/nsimage.m b/src/nsimage.m index 51367915e1b..cc8abf76094 100644 --- a/src/nsimage.m +++ b/src/nsimage.m | |||
| @@ -179,13 +179,6 @@ ns_set_alpha (void *img, int x, int y, unsigned char a) | |||
| 179 | return nil; | 179 | return nil; |
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | /* The next two lines cause the DPI of the image to be ignored. | ||
| 183 | This seems to be the behavior users expect. */ | ||
| 184 | #ifdef NS_IMPL_COCOA | ||
| 185 | #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 | ||
| 186 | [image setScalesWhenResized: YES]; | ||
| 187 | #endif | ||
| 188 | #endif | ||
| 189 | [image setSize: NSMakeSize([imgRep pixelsWide], [imgRep pixelsHigh])]; | 182 | [image setSize: NSMakeSize([imgRep pixelsWide], [imgRep pixelsHigh])]; |
| 190 | 183 | ||
| 191 | [image setName: [NSString stringWithUTF8String: SSDATA (file)]]; | 184 | [image setName: [NSString stringWithUTF8String: SSDATA (file)]]; |
| @@ -355,13 +348,6 @@ ns_set_alpha (void *img, int x, int y, unsigned char a) | |||
| 355 | if ([bmr numberOfPlanes] >= 3) | 348 | if ([bmr numberOfPlanes] >= 3) |
| 356 | [bmr getBitmapDataPlanes: pixmapData]; | 349 | [bmr getBitmapDataPlanes: pixmapData]; |
| 357 | 350 | ||
| 358 | /* The next two lines cause the DPI of the image to be ignored. | ||
| 359 | This seems to be the behavior users expect. */ | ||
| 360 | #ifdef NS_IMPL_COCOA | ||
| 361 | #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6 | ||
| 362 | [self setScalesWhenResized: YES]; | ||
| 363 | #endif | ||
| 364 | #endif | ||
| 365 | [self setSize: NSMakeSize([bmr pixelsWide], [bmr pixelsHigh])]; | 351 | [self setSize: NSMakeSize([bmr pixelsWide], [bmr pixelsHigh])]; |
| 366 | 352 | ||
| 367 | break; | 353 | break; |