diff options
| author | Philipp Stephani <phst@google.com> | 2017-05-20 16:44:40 +0200 |
|---|---|---|
| committer | Philipp Stephani <phst@google.com> | 2017-05-21 21:49:52 +0200 |
| commit | add0b69445f65fe1792fe3ab5f8a8d35b997f728 (patch) | |
| tree | 45f81c62caf78576ece603b6696dbd09c123e170 /src/macfont.m | |
| parent | cc6db8b6aa5ddda9a8ca51d836096be991836d07 (diff) | |
| download | emacs-add0b69445f65fe1792fe3ab5f8a8d35b997f728.tar.gz | |
Remove calls to deprecated setUsesScreenFonts
* src/macfont.m (mac_screen_font_get_metrics): Don't call setUsesScreenFonts.
(mac_font_shape_1): Remove screen_font_p parameter.
(mac_screen_font_shape): Remove screen_font_p argument.
Diffstat (limited to 'src/macfont.m')
| -rw-r--r-- | src/macfont.m | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/macfont.m b/src/macfont.m index b859eb43787..dccb4e6fd02 100644 --- a/src/macfont.m +++ b/src/macfont.m @@ -284,7 +284,6 @@ mac_screen_font_get_metrics (ScreenFontRef font, CGFloat *ascent, [textStorage setFont:nsFont]; [textContainer setLineFragmentPadding:0]; - [layoutManager setUsesScreenFonts:YES]; [layoutManager addTextContainer:textContainer]; [textContainer release]; @@ -318,8 +317,7 @@ mac_screen_font_get_metrics (ScreenFontRef font, CGFloat *ascent, static CFIndex mac_font_shape_1 (NSFont *font, NSString *string, - struct mac_glyph_layout *glyph_layouts, CFIndex glyph_len, - BOOL screen_font_p) + struct mac_glyph_layout *glyph_layouts, CFIndex glyph_len) { NSUInteger i; CFIndex result = 0; @@ -339,7 +337,6 @@ mac_font_shape_1 (NSFont *font, NSString *string, initWithString:@" "] autorelease])]; [textStorage setFont:font]; [textContainer setLineFragmentPadding:0]; - [layoutManager setUsesScreenFonts:screen_font_p]; [layoutManager addTextContainer:textContainer]; [textContainer release]; @@ -587,7 +584,7 @@ mac_screen_font_shape (ScreenFontRef font, CFStringRef string, { return mac_font_shape_1 ([(NSFont *)font printerFont], (NSString *) string, - glyph_layouts, glyph_len, YES); + glyph_layouts, glyph_len); } static CGColorRef |