diff options
author | Jason Rumney <jasonr@gnu.org> | 2008-07-16 10:06:08 +0000 |
---|---|---|
committer | Jason Rumney <jasonr@gnu.org> | 2008-07-16 10:06:08 +0000 |
commit | 5cc9d48a1db9f374a010477696a77b06ee49a68b (patch) | |
tree | 5daf1835218f8aab8bbeda9ea99f3d38806d684d /src/w32gui.h | |
parent | ce69239ac9ae85048e393da62f0fae4a9854ff78 (diff) |
Fix last change.
Diffstat (limited to 'src/w32gui.h')
-rw-r--r-- | src/w32gui.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/src/w32gui.h b/src/w32gui.h index d9f09e3313..595796e4c0 100644 --- a/src/w32gui.h +++ b/src/w32gui.h @@ -21,19 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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 @@ typedef struct _XCharStruct #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 { |