From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Sun, 13 Nov 2005 05:46:17 +0000 (+0000)
Subject: (USE_CG_TEXT_DRAWING): New define.
X-Git-Tag: emacs-pretest-22.0.90~5929
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=26d2699b2204785b9955d0b0fa685674ac6cc501;p=emacs.git

(USE_CG_TEXT_DRAWING): New define.
(struct MacFontStruct) [USE_CG_TEXT_DRAWING]: New members cg_font
and cg_glyphs.
---

diff --git a/src/macgui.h b/src/macgui.h
index 6e2adb092c6..40244dbc7c6 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -92,6 +92,12 @@ typedef GWorldPtr Pixmap;
 #endif
 
 
+#ifndef USE_CG_TEXT_DRAWING
+#if USE_ATSUI && MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
+#define USE_CG_TEXT_DRAWING 1
+#endif
+#endif
+
 /* Emulate XCharStruct.  */
 typedef struct _XCharStruct
 {
@@ -127,6 +133,10 @@ struct MacFontStruct {
 #endif
 #if USE_ATSUI
   ATSUStyle mac_style;		/* NULL if QuickDraw Text is used */
+#if USE_CG_TEXT_DRAWING
+  CGFontRef cg_font;		/* NULL if ATSUI text drawing is used */
+  CGGlyph *cg_glyphs;		/* Likewise  */
+#endif
 #endif
 
 /* from Xlib.h */