Mercurial > emacs

comparison src/dispextern.h @ 90070:95879cc1ed20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-81 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-748 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-749 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-750 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-751 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-753 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-754 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-755 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-757 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-78 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-79 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-80 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-81 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82 Update from CVS
author Miles Bader <miles@gnu.org>
date Sun, 02 Jan 2005 09:13:19 +0000
parents f2ebccfa87d4 9bde7721ad0f
children f6b4d0ebf147
comparison
equal deleted inserted replaced
90069:fa0a5c4db2c8 90070:95879cc1ed20
60 typedef struct w32_display_info Display_Info; 60 typedef struct w32_display_info Display_Info;
61 typedef XImage *XImagePtr; 61 typedef XImage *XImagePtr;
62 typedef HDC XImagePtr_or_DC; 62 typedef HDC XImagePtr_or_DC;
63 #endif 63 #endif
64 64
65 #ifdef HAVE_CARBON 65 #ifdef MAC_OS
66 #include "macgui.h" 66 #include "macgui.h"
67 typedef struct mac_display_info Display_Info; 67 typedef struct mac_display_info Display_Info;
68 /* Mac equivalent of XImage. */ 68 /* Mac equivalent of XImage. */
69 typedef Pixmap XImagePtr; 69 typedef Pixmap XImagePtr;
70 typedef XImagePtr XImagePtr_or_DC; 70 typedef XImagePtr XImagePtr_or_DC;
1169 and we should use the physical height of the line this glyph 1169 and we should use the physical height of the line this glyph
1170 string appears in as clip rect. */ 1170 string appears in as clip rect. */
1171 unsigned for_overlaps_p : 1; 1171 unsigned for_overlaps_p : 1;
1172 1172
1173 /* The GC to use for drawing this glyph string. */ 1173 /* The GC to use for drawing this glyph string. */
1174 #if defined(HAVE_X_WINDOWS) || defined(HAVE_CARBON) 1174 #if defined(HAVE_X_WINDOWS) || defined(MAC_OS)
1175 GC gc; 1175 GC gc;
1176 #endif 1176 #endif
1177 #if defined(HAVE_NTGUI) 1177 #if defined(HAVE_NTGUI)
1178 XGCValues *gc; 1178 XGCValues *gc;
1179 HDC hdc; 1179 HDC hdc;