(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 6e2adb092c677ce2d47ed503ac46cb94fc5c8ad1..40244dbc7c6caeb02a0eb7070cd9b4b7d355d8bc 100644 (file)
--- 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 */