aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlp Aker2013-10-01 23:26:29 -0400
committerAlp Aker2013-10-01 23:26:29 -0400
commit45435f08570d581a4126febe4fb8589d8e3ea959 (patch)
tree0fcbbef6d4235a2e4ccabd45cad486c790d2bbf5 /src
parent4e356363b04278ea66baa27f8a0c687a2b40f013 (diff)
downloademacs-45435f08570d581a4126febe4fb8589d8e3ea959.tar.gz
emacs-45435f08570d581a4126febe4fb8589d8e3ea959.zip
* macfont.m (macfont_draw): Use CGRectMake rather than NSMakeRect
(Bug#15500).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/macfont.m2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2bedb2997ac..2274071a902 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-10-01 Alp Aker <alp.tekin.aker@gmail.com>
2
3 * macfont.m (macfont_draw): Use CGRectMake rather than NSMakeRect
4 (Bug#15500).
5
12013-09-29 Eli Zaretskii <eliz@gnu.org> 62013-09-29 Eli Zaretskii <eliz@gnu.org>
2 7
3 * xdisp.c (get_next_display_element): Don't call face_for_font in 8 * xdisp.c (get_next_display_element): Don't call face_for_font in
diff --git a/src/macfont.m b/src/macfont.m
index ab5029743ef..cb913991e06 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -2708,7 +2708,7 @@ macfont_draw (struct glyph_string *s, int from, int to, int x, int y,
2708 { 2708 {
2709 CG_SET_FILL_COLOR_WITH_GC_BACKGROUND (context, s); 2709 CG_SET_FILL_COLOR_WITH_GC_BACKGROUND (context, s);
2710 CGContextFillRect (context, 2710 CGContextFillRect (context,
2711 NSMakeRect (x, y, 2711 CGRectMake (x, y,
2712 s->width, FONT_HEIGHT (s->font))); 2712 s->width, FONT_HEIGHT (s->font)));
2713 } 2713 }
2714 2714