Mercurial > emacs
comparison src/macgui.h @ 90147:e1fbb019c538
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-39
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 258-271)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 66)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 21 Apr 2005 05:59:53 +0000 |
parents | 30ad2795fdab 8af99087c1e5 |
children | 08185296b491 |
comparison
equal
deleted
inserted
replaced
90146:a4445dd2a017 | 90147:e1fbb019c538 |
---|---|
99 (xcs).rbearing = (bds).right, \ | 99 (xcs).rbearing = (bds).right, \ |
100 (xcs).ascent = -(bds).top, \ | 100 (xcs).ascent = -(bds).top, \ |
101 (xcs).descent = (bds).bottom) | 101 (xcs).descent = (bds).bottom) |
102 | 102 |
103 struct MacFontStruct { | 103 struct MacFontStruct { |
104 char *fontname; | 104 char *full_name; |
105 | 105 |
106 short mac_fontnum; /* font number of font used in this window */ | 106 short mac_fontnum; /* font number of font used in this window */ |
107 int mac_fontsize; /* size of font */ | 107 int mac_fontsize; /* size of font */ |
108 short mac_fontface; /* plain, bold, italics, etc. */ | 108 short mac_fontface; /* plain, bold, italics, etc. */ |
109 #if TARGET_API_MAC_CARBON | |
110 int mac_scriptcode; /* Mac OS script code for font used */ | |
111 #else | |
109 short mac_scriptcode; /* Mac OS script code for font used */ | 112 short mac_scriptcode; /* Mac OS script code for font used */ |
113 #endif | |
110 | 114 |
111 #if 0 | 115 #if 0 |
112 SInt16 mFontNum; /* font number of font used in this window */ | 116 SInt16 mFontNum; /* font number of font used in this window */ |
113 short mScriptCode; /* Mac OS script code for font used */ | 117 short mScriptCode; /* Mac OS script code for font used */ |
114 int mFontSize; /* size of font */ | 118 int mFontSize; /* size of font */ |