diff options
| author | Kim F. Storm <storm@cua.dk> | 2003-05-24 22:03:10 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2003-05-24 22:03:10 +0000 |
| commit | fdbf2e9bc784c6f28a643eb38f55881b19b6710b (patch) | |
| tree | 066d36e1b97de14dde948de2a5d1c2b8bb863a37 /src/msdos.h | |
| parent | c655f6fdf292fea9340777de7c7ed01c88a728d1 (diff) | |
| download | emacs-fdbf2e9bc784c6f28a643eb38f55881b19b6710b.tar.gz | |
(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.
Diffstat (limited to 'src/msdos.h')
| -rw-r--r-- | src/msdos.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/msdos.h b/src/msdos.h index fa21d24650b..40d01a8bba6 100644 --- a/src/msdos.h +++ b/src/msdos.h @@ -90,9 +90,6 @@ typedef struct display_info Display_Info; /* 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 @@ extern struct x_output the_only_x_display; #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 @@ extern int x_pixel_height P_ ((struct frame *)); #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) |