From: Jason Rumney <jasonr@gnu.org>
Date: Thu, 31 May 2007 00:52:52 +0000 (+0000)
Subject: (w32_output_data) [USE_FONT_BACKEND]: Add fontp member.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~488
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=47e420b58081680be9a4dd409bdbdee917bc5bd5;p=emacs.git

(w32_output_data) [USE_FONT_BACKEND]: Add fontp member.
(FRAME_FONT_OBJECT) [USE_FONT_BACKEND]: New macro from xterm.h.
---

diff --git a/src/w32term.h b/src/w32term.h
index 6a3f7267e25..52b6d9c9427 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -324,6 +324,10 @@ struct w32_output
   /* Default ASCII font of this frame. */
   XFontStruct *font;
 
+#ifdef USE_FONT_BACKEND
+  struct font *fontp;
+#endif	/* USE_FONT_BACKEND */
+
   /* The baseline offset of the default ASCII font.  */
   int baseline_offset;
 
@@ -413,6 +417,10 @@ extern struct w32_output w32term_display;
 #define FRAME_FONTSET(f) ((f)->output_data.w32->fontset)
 #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.w32->baseline_offset)
 
+#ifdef USE_FONT_BACKEND
+#define FRAME_FONT_OBJECT(f) ((f)->output_data.w32->fontp)
+#endif	/* USE_FONT_BACKEND */
+
 /* This gives the w32_display_info structure for the display F is on.  */
 #define FRAME_W32_DISPLAY_INFO(f) (&one_w32_display_info)
 #define FRAME_X_DISPLAY_INFO(f) (&one_w32_display_info)