Mercurial > emacs
changeset 51202:62a7506ec831
(struct x_output): Remove members left_pos, top_pos,
and line_height, and use corresponding new members in struct
frame. All uses changed.
(FRAME_LINE_HEIGHT, FRAME_INTERNAL_BORDER_WIDTH): Remove macros;
superseeded by corresponding macros in frame.h.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Sat, 24 May 2003 22:03:10 +0000 |
| parents | df6e2df16eb0 |
| children | f04f396f6f9f |
| files | src/msdos.h |
| diffstat | 1 files changed, 2 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/msdos.h Sat May 24 22:02:52 2003 +0000 +++ b/src/msdos.h Sat May 24 22:03:10 2003 +0000 @@ -90,9 +90,6 @@ /* 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) */ @@ -108,9 +105,6 @@ #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. */ @@ -129,8 +123,8 @@ #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 DisplayWidth(p1,p2) (SELECTED_FRAME()->text_cols) +#define DisplayHeight(p1,p2) (SELECTED_FRAME()->text_lines) #define XMenuSetAEQ (void) #define XMenuSetFreeze (void) #define XMenuRecompute (void)