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

[Kim F. Storm]

Index: emacs/src/msdos.h
diff -c emacs/src/msdos.h:1.26 emacs/src/msdos.h:1.27
*** emacs/src/msdos.h:1.26      Fri Mar 21 17:56:52 2003
--- emacs/src/msdos.h   Sat May 24 18:03:10 2003
***************
*** 90,98 ****
  /* This is a cut-down version of the one in xterm.h, which see.  */
  struct x_output
  {
-   int left_pos;                       /* used in xmenu_show (xmenu.c) */
-   int top_pos;                        /* ditto */
-   int line_height;            /* used in x-popup-menu (xmenu.c) */
    PIX_TYPE background_pixel;  /* used in xfaces.c and lots of other places */
    PIX_TYPE foreground_pixel;  /* ditto */
    XFontStruct *font;          /* used in x-popup-menu (xmenu.c) */
--- 90,95 ----
***************
*** 108,116 ****
  #define FRAME_BACKGROUND_PIXEL(f) (the_only_x_display.background_pixel)
  #define FRAME_FONT(f) (the_only_x_display.font)
  #define FRAME_X_DISPLAY_INFO(f) (&the_only_x_display.display_info)
- #define FRAME_LINE_HEIGHT(f) (the_only_x_display.line_height)
- 
- #define FRAME_INTERNAL_BORDER_WIDTH(f) (0)
  
  /* Prototypes.  */
  
--- 105,110 ----
***************
*** 129,136 ****
  #define x_destroy_bitmap(p1,p2)
  #define load_pixmap(p1,p2,p3,p4) (0)
  #define XGetGeometry(p1,p2,p3,p4,p5,p6,p7,p8,p9)
! #define DisplayWidth(p1,p2) (SELECTED_FRAME()->width)
! #define DisplayHeight(p1,p2) (SELECTED_FRAME()->height)
  #define XMenuSetAEQ (void)
  #define XMenuSetFreeze (void)
  #define XMenuRecompute (void)
--- 123,130 ----
  #define x_destroy_bitmap(p1,p2)
  #define load_pixmap(p1,p2,p3,p4) (0)
  #define XGetGeometry(p1,p2,p3,p4,p5,p6,p7,p8,p9)
! #define DisplayWidth(p1,p2) (SELECTED_FRAME()->text_cols)
! #define DisplayHeight(p1,p2) (SELECTED_FRAME()->text_lines)
  #define XMenuSetAEQ (void)
  #define XMenuSetFreeze (void)
  #define XMenuRecompute (void)