(MSDOS_SUPPORT): Remove ccl.elc and codepage.elc.

[gnu-emacs] / src / w32font.h

diff --git a/src/w32font.h b/src/w32font.h
index 8aba6a3e6d59d46b8b521a7de071169a303c49cc..748b329f8da6b6bd538ca613ddda3612612084f8 100644 (file)
--- a/src/w32font.h
+++ b/src/w32font.h
@@ -3,10 +3,10 @@
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_W32FONT_H
 #define EMACS_W32FONT_H
@@ -51,14 +49,16 @@ struct w32_metric_cache
 struct w32font_info
 {
   struct font font;
-  TEXTMETRIC metrics;
+  TEXTMETRICW metrics;
   unsigned int glyph_idx;
   struct w32_metric_cache **cached_metrics;
   int n_cache_blocks;
-  W32FontStruct *compat_w32_font;
+  HFONT hfont;
 };
 
-#define FONT_COMPAT(f) (((struct w32font_info *) (f))->compat_w32_font)
+/* Macros for getting OS specific information from a font struct.  */
+#define FONT_HANDLE(f) (((struct w32font_info *)(f))->hfont)
+#define FONT_TEXTMETRIC(f) (((struct w32font_info *)(f))->metrics)
 
 #define CACHE_BLOCKSIZE 128