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

[Juanma Barranquero]

Index: emacs/src/w32term.h
diff -c emacs/src/w32term.h:1.50 emacs/src/w32term.h:1.51
*** emacs/src/w32term.h:1.50    Tue Jan 21 18:06:05 2003
--- emacs/src/w32term.h Tue Feb  4 09:03:16 2003
***************
*** 66,72 ****
  /* Structure recording bitmaps and reference count.
     If REFCOUNT is 0 then this record is free to be reused.  */
  
! struct w32_bitmap_record 
  {
    Pixmap pixmap;
    char *file;
--- 66,72 ----
  /* Structure recording bitmaps and reference count.
     If REFCOUNT is 0 then this record is free to be reused.  */
  
! struct w32_bitmap_record
  {
    Pixmap pixmap;
    char *file;
***************
*** 337,343 ****
    /* Foreground color for scroll bars.  A value of -1 means use the
       default (black for non-toolkit scroll bars).  */
    COLORREF scroll_bar_foreground_pixel;
!   
    /* Background color for scroll bars.  A value of -1 means use the
       default (background color of the frame for non-toolkit scroll
       bars).  */
--- 337,343 ----
    /* Foreground color for scroll bars.  A value of -1 means use the
       default (black for non-toolkit scroll bars).  */
    COLORREF scroll_bar_foreground_pixel;
! 
    /* Background color for scroll bars.  A value of -1 means use the
       default (background color of the frame for non-toolkit scroll
       bars).  */
***************
*** 355,361 ****
    /* Window whose cursor is hourglass_cursor.  This window is
       temporarily mapped to display an hourglass cursor.  */
    Window hourglass_window;
!   
    /* Non-zero means hourglass cursor is currently displayed.  */
    unsigned hourglass_p : 1;
  
--- 355,361 ----
    /* Window whose cursor is hourglass_cursor.  This window is
       temporarily mapped to display an hourglass cursor.  */
    Window hourglass_window;
! 
    /* Non-zero means hourglass cursor is currently displayed.  */
    unsigned hourglass_p : 1;
  
***************
*** 595,601 ****
  
  /* Return the length of the rectangle within which the top of the
     handle must stay.  This isn't equivalent to the inside height,
!    because the scroll bar handle has a minimum height.  
  
     This is the real range of motion for the scroll bar, so when we're
     scaling buffer positions to scroll bar positions, we use this, not
--- 595,601 ----
  
  /* Return the length of the rectangle within which the top of the
     handle must stay.  This isn't equivalent to the inside height,
!    because the scroll bar handle has a minimum height.
  
     This is the real range of motion for the scroll bar, so when we're
     scaling buffer positions to scroll bar positions, we use this, not
***************
*** 658,664 ****
     + (f)->output_data.w32->internal_border_width)
  
  
! /* Return the row/column (zero-based) of the character cell containing 
     the pixel on FRAME at ROW/COL.  */
  #define PIXEL_TO_CHAR_ROW(f, row) \
    (((row) - (f)->output_data.w32->internal_border_width) \
--- 658,664 ----
     + (f)->output_data.w32->internal_border_width)
  
  
! /* Return the row/column (zero-based) of the character cell containing
     the pixel on FRAME at ROW/COL.  */
  #define PIXEL_TO_CHAR_ROW(f, row) \
    (((row) - (f)->output_data.w32->internal_border_width) \
***************
*** 739,749 ****
  #define WM_EMACS_SETCURSOR             (WM_EMACS_START + 19)
  #define WM_EMACS_END                   (WM_EMACS_START + 20)
  
! #define WND_FONTWIDTH_INDEX    (0) 
! #define WND_LINEHEIGHT_INDEX   (4) 
! #define WND_BORDER_INDEX       (8) 
! #define WND_SCROLLBAR_INDEX    (12) 
! #define WND_BACKGROUND_INDEX   (16) 
  #define WND_LAST_INDEX         (20)
  
  #define WND_EXTRA_BYTES     (WND_LAST_INDEX)
--- 739,749 ----
  #define WM_EMACS_SETCURSOR             (WM_EMACS_START + 19)
  #define WM_EMACS_END                   (WM_EMACS_START + 20)
  
! #define WND_FONTWIDTH_INDEX    (0)
! #define WND_LINEHEIGHT_INDEX   (4)
! #define WND_BORDER_INDEX       (8)
! #define WND_SCROLLBAR_INDEX    (12)
! #define WND_BACKGROUND_INDEX   (16)
  #define WND_LAST_INDEX         (20)
  
  #define WND_EXTRA_BYTES     (WND_LAST_INDEX)
***************
*** 831,837 ****
  #define WM_MOUSELEAVE 0x02A3
  #define TME_LEAVE 0x00000002;
  
! typedef struct tagTRACKMOUSEEVENT 
  {
    DWORD cbSize;
    DWORD dwFlags;
--- 831,837 ----
  #define WM_MOUSELEAVE 0x02A3
  #define TME_LEAVE 0x00000002;
  
! typedef struct tagTRACKMOUSEEVENT
  {
    DWORD cbSize;
    DWORD dwFlags;