mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-01 01:41:01 -08:00
Code Issues Projects Releases Wiki Activity

Remove old macOS compatibility code

Browse source 
* 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+.
This commit is contained in:
Alan Third 2017-03-07 14:45:03 +00:00
parent 19a04b4c32
commit ea5a7f990d
3 changed files with 0 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/nsimage.m
View file

@ -179,13 +179,6 @@ ns_set_alpha (void *img, int x, int y, unsigned char a)
return nil;
}
/* The next two lines cause the DPI of the image to be ignored.
This seems to be the behavior users expect. */
#ifdef NS_IMPL_COCOA
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
[image setScalesWhenResized: YES];
#endif
#endif
[image setSize: NSMakeSize([imgRep pixelsWide], [imgRep pixelsHigh])];
[image setName: [NSString stringWithUTF8String: SSDATA (file)]];
@ -355,13 +348,6 @@ ns_set_alpha (void *img, int x, int y, unsigned char a)
if ([bmr numberOfPlanes] >= 3)
[bmr getBitmapDataPlanes: pixmapData];
/* The next two lines cause the DPI of the image to be ignored.
This seems to be the behavior users expect. */
#ifdef NS_IMPL_COCOA
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
[self setScalesWhenResized: YES];
#endif
#endif
[self setSize: NSMakeSize([bmr pixelsWide], [bmr pixelsHigh])];
break;

5
src/nsmenu.m
View file

@ -1519,11 +1519,6 @@ ns_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
area.size.width = ICONSIZE;
area.size.height= ICONSIZE;
img = [[NSImage imageNamed: @"NSApplicationIcon"] copy];
#ifdef NS_IMPL_COCOA
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
[img setScalesWhenResized: YES];
#endif
#endif
[img setSize: NSMakeSize (ICONSIZE, ICONSIZE)];
imgView = [[NSImageView alloc] initWithFrame: area];
[imgView setImage: img];

25
src/nsterm.m
View file

@ -5936,31 +5936,6 @@ not_in_argv (NSString *arg)
}
#ifdef NS_IMPL_COCOA
/* Needed to pick up Ctrl-tab and possibly other events that Mac OS X
decided not to send key-down for.
See http://osdir.com/ml/editors.vim.mac/2007-10/msg00141.html
This only applies on Tiger and earlier.
If it matches one of these, send it on to keyDown. */
-(void)keyUp: (NSEvent *)theEvent
{
int flags = [theEvent modifierFlags];
int code = [theEvent keyCode];
NSTRACE ("[EmacsView keyUp:]");
if (floor (NSAppKitVersionNumber) <= 824 /*NSAppKitVersionNumber10_4*/ &&
code == 0x30 && (flags & NSEventModifierFlagControl) && !(flags & NSEventModifierFlagCommand))
{
if (NS_KEYLOG)
fprintf (stderr, "keyUp: passed test");
ns_fake_keydown = YES;
[self keyDown: theEvent];
}
}
#endif
/* <NSTextInput> implementation (called through super interpretKeyEvents:]). */