Commit 444a42fd authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

(mac_compute_glyph_string_overhangs, XLoadQueryFont)

[USE_CG_DRAWING]: Call mac_prepare_for_quickdraw before QDTextBounds.
parent 4ccaff67
2006-09-26 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* macterm.c (mac_compute_glyph_string_overhangs, XLoadQueryFont)
[USE_CG_DRAWING]: Call mac_prepare_for_quickdraw before QDTextBounds.
2006-09-26 Kenichi Handa <handa@m17n.org>
 
* keymap.c (Fsingle_key_description): For an invalid char, return
......
......@@ -2634,6 +2634,11 @@ mac_compute_glyph_string_overhangs (s)
Rect r;
MacFontStruct *font = s->font;
#if USE_CG_DRAWING
mac_prepare_for_quickdraw (s->f);
#endif
SetPortWindowPort (FRAME_MAC_WINDOW (s->f));
TextFont (font->mac_fontnum);
TextSize (font->mac_fontsize);
TextFace (font->mac_fontface);
......@@ -8001,6 +8006,9 @@ XLoadQueryFont (Display *dpy, char *fontname)
FontInfo the_fontinfo;
int is_two_byte_font;
#if USE_CG_DRAWING
mac_prepare_for_quickdraw (NULL);
#endif
/* Save the current font number used. */
GetPort (&port);
#if TARGET_API_MAC_CARBON
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment