[Emacs-diffs] Changes to emacs/src/w32gui.h,v

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   08/07/16 10:03:39

Index: w32gui.h
===================================================================
RCS file: /sources/emacs/emacs/src/w32gui.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- w32gui.h    15 Jul 2008 18:15:17 -0000      1.35
+++ w32gui.h    16 Jul 2008 10:03:39 -0000      1.36
@@ -21,19 +21,6 @@
 #define EMACS_W32GUI_H
 #include <windows.h>
 
-#include "w32bdf.h"
-
-/* Emulate XCharStruct.  */
-typedef struct _XCharStruct
-{
-  short rbearing;
-  short lbearing;
-  short width;
-  short ascent;
-  short descent;
-} XCharStruct;
-
-
 /* Local memory management for menus.  */
 #define local_heap (GetProcessHeap ())
 #define local_alloc(n) (HeapAlloc (local_heap, HEAP_ZERO_MEMORY, (n)))
@@ -42,30 +29,6 @@
 #define malloc_widget_value() ((widget_value *) local_alloc (sizeof 
(widget_value)))
 #define free_widget_value(wv) (local_free ((wv)))
 
-
-enum w32_char_font_type
-{
-  UNKNOWN_FONT = 0 /* FONT_TYPE_UNKNOWN */,
-  ANSI_FONT,
-  UNICODE_FONT,
-  BDF_1D_FONT,
-  BDF_2D_FONT
-};
-
-typedef struct W32FontStruct {
-  enum w32_char_font_type font_type;
-  TEXTMETRIC tm;
-  HFONT hfont;
-  bdffont *bdf;
-  int double_byte_p;
-  XCharStruct max_bounds;
-  XCharStruct scratch;
-  /* Only store info for ascii chars, if not fixed pitch.  */
-  XCharStruct * per_char;
-} W32FontStruct;
-
-typedef struct W32FontStruct XFontStruct;
-
 /* Emulate X GC's by keeping color and font info in a structure.  */
 typedef struct _XGCValues
 {