[Emacs-diffs] Changes to emacs/src/macgui.h

[YAMAMOTO Mitsuharu]

Index: emacs/src/macgui.h
diff -c emacs/src/macgui.h:1.25 emacs/src/macgui.h:1.26
*** emacs/src/macgui.h:1.25     Sat Oct  8 02:27:47 2005
--- emacs/src/macgui.h  Sun Nov 13 05:46:17 2005
***************
*** 92,97 ****
--- 92,103 ----
  #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,132 ****
--- 133,142 ----
  #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 */