diff options
| author | Philipp Stephani | 2017-05-20 16:44:40 +0200 |
|---|---|---|
| committer | Philipp Stephani | 2017-05-21 21:49:52 +0200 |
| commit | add0b69445f65fe1792fe3ab5f8a8d35b997f728 (patch) | |
| tree | 45f81c62caf78576ece603b6696dbd09c123e170 /src/macfont.m | |
| parent | cc6db8b6aa5ddda9a8ca51d836096be991836d07 (diff) | |
| download | emacs-add0b69445f65fe1792fe3ab5f8a8d35b997f728.tar.gz emacs-add0b69445f65fe1792fe3ab5f8a8d35b997f728.zip | |
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, | |||
| 284 | 284 | ||
| 285 | [textStorage setFont:nsFont]; | 285 | [textStorage setFont:nsFont]; |
| 286 | [textContainer setLineFragmentPadding:0]; | 286 | [textContainer setLineFragmentPadding:0]; |
| 287 | [layoutManager setUsesScreenFonts:YES]; | ||
| 288 | 287 | ||
| 289 | [layoutManager addTextContainer:textContainer]; | 288 | [layoutManager addTextContainer:textContainer]; |
| 290 | [textContainer release]; | 289 | [textContainer release]; |
| @@ -318,8 +317,7 @@ mac_screen_font_get_metrics (ScreenFontRef font, CGFloat *ascent, | |||
| 318 | 317 | ||
| 319 | static CFIndex | 318 | static CFIndex |
| 320 | mac_font_shape_1 (NSFont *font, NSString *string, | 319 | mac_font_shape_1 (NSFont *font, NSString *string, |
| 321 | struct mac_glyph_layout *glyph_layouts, CFIndex glyph_len, | 320 | struct mac_glyph_layout *glyph_layouts, CFIndex glyph_len) |
| 322 | BOOL screen_font_p) | ||
| 323 | { | 321 | { |
| 324 | NSUInteger i; | 322 | NSUInteger i; |
| 325 | CFIndex result = 0; | 323 | CFIndex result = 0; |
| @@ -339,7 +337,6 @@ mac_font_shape_1 (NSFont *font, NSString *string, | |||
| 339 | initWithString:@" "] autorelease])]; | 337 | initWithString:@" "] autorelease])]; |
| 340 | [textStorage setFont:font]; | 338 | [textStorage setFont:font]; |
| 341 | [textContainer setLineFragmentPadding:0]; | 339 | [textContainer setLineFragmentPadding:0]; |
| 342 | [layoutManager setUsesScreenFonts:screen_font_p]; | ||
| 343 | 340 | ||
| 344 | [layoutManager addTextContainer:textContainer]; | 341 | [layoutManager addTextContainer:textContainer]; |
| 345 | [textContainer release]; | 342 | [textContainer release]; |
| @@ -587,7 +584,7 @@ mac_screen_font_shape (ScreenFontRef font, CFStringRef string, | |||
| 587 | { | 584 | { |
| 588 | return mac_font_shape_1 ([(NSFont *)font printerFont], | 585 | return mac_font_shape_1 ([(NSFont *)font printerFont], |
| 589 | (NSString *) string, | 586 | (NSString *) string, |
| 590 | glyph_layouts, glyph_len, YES); | 587 | glyph_layouts, glyph_len); |
| 591 | } | 588 | } |
| 592 | 589 | ||
| 593 | static CGColorRef | 590 | static CGColorRef |