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

[Kim F. Storm]

Index: emacs/src/w32gui.h
diff -c emacs/src/w32gui.h:1.17 emacs/src/w32gui.h:1.18
*** emacs/src/w32gui.h:1.17     Fri Oct 25 02:49:40 2002
--- emacs/src/w32gui.h  Sun Mar 16 15:47:30 2003
***************
*** 36,42 ****
  
  enum w32_char_font_type
  {
!   UNKNOWN_FONT,
    ANSI_FONT,
    UNICODE_FONT,
    BDF_1D_FONT,
--- 36,42 ----
  
  enum w32_char_font_type
  {
!   UNKNOWN_FONT = 0 /* FONT_TYPE_UNKNOWN */,
    ANSI_FONT,
    UNICODE_FONT,
    BDF_1D_FONT,
***************
*** 76,82 ****
--- 76,96 ----
  typedef COLORREF Color;
  typedef DWORD Time;
  typedef HWND Window;
+ typedef int Display;  /* ++KFS: define here? */
  typedef HCURSOR Cursor;
+ 
+ #define XChar2b wchar_t
+ 
+ /* Dealing with bits of wchar_t as if they were an XChar2b.  */
+ #define STORE_XCHAR2B(chp, byte1, byte2) \
+   ((*chp) = ((XChar2b)((((byte1) & 0x00ff) << 8) | ((byte2) & 0x00ff))))
+ 
+ #define XCHAR2B_BYTE1(chp) \
+  (((*chp) & 0xff00) >> 8)
+ 
+ #define XCHAR2B_BYTE2(chp) \
+  ((*chp) & 0x00ff)
+ 
  
  /* Windows equivalent of XImage.  */
  typedef struct _XImage