Commit c7cc32f7 authored by Dmitry Antipov's avatar Dmitry Antipov
Browse files

* frame.h (FRAME_SMALLEST_CHAR_WIDTH, FRAME_SMALLEST_FONT_HEIGHT):

Define once here...
* nsterm.h, w32term.h, xterm.h: ...and not here.
parent 07013c68
......@@ -2,6 +2,9 @@
* xterm.h (FRAME_X_SCREEN_NUMBER): Add comment.
(BLACK_PIX_DEFAULT, WHITE_PIX_DEFAULT): Use FRAME_X_SCREEN_NUMBER.
* frame.h (FRAME_SMALLEST_CHAR_WIDTH, FRAME_SMALLEST_FONT_HEIGHT):
Define once here...
* nsterm.h, w32term.h, xterm.h: ...and not here.
2013-09-14 Eli Zaretskii <eliz@gnu.org>
......
......@@ -1131,6 +1131,15 @@ extern Lisp_Object selected_frame;
(FRAME_PIXEL_Y_TO_LINE (f, ((height) \
- FRAME_INTERNAL_BORDER_WIDTH (f))))
/* Value is the smallest width of any character in any font on frame F. */
#define FRAME_SMALLEST_CHAR_WIDTH(f) \
FRAME_DISPLAY_INFO (f)->smallest_char_width
/* Value is the smallest height of any font on frame F. */
#define FRAME_SMALLEST_FONT_HEIGHT(f) \
FRAME_DISPLAY_INFO (f)->smallest_font_height
/***********************************************************************
Frame Parameters
......
......@@ -746,10 +746,6 @@ struct x_output
#define FRAME_FONTSET(f) ((f)->output_data.ns->fontset)
#define FRAME_SMALLEST_CHAR_WIDTH(f) \
(FRAME_DISPLAY_INFO (f)->smallest_char_width)
#define FRAME_SMALLEST_FONT_HEIGHT(f) \
(FRAME_DISPLAY_INFO (f)->smallest_font_height)
#define FRAME_BASELINE_OFFSET(f) ((f)->output_data.ns->baseline_offset)
#define BLACK_PIX_DEFAULT(f) 0x000000
#define WHITE_PIX_DEFAULT(f) 0xFFFFFF
......
......@@ -382,16 +382,6 @@ extern struct w32_output w32term_display;
/* This is the `Display *' which frame F is on. */
#define FRAME_X_DISPLAY(f) (0)
/* Value is the smallest width of any character in any font on frame F. */
#define FRAME_SMALLEST_CHAR_WIDTH(F) \
FRAME_DISPLAY_INFO(F)->smallest_char_width
/* Value is the smallest height of any font on frame F. */
#define FRAME_SMALLEST_FONT_HEIGHT(F) \
FRAME_DISPLAY_INFO(F)->smallest_font_height
#define FRAME_NORMAL_PLACEMENT(F) ((F)->output_data.w32->normal_placement)
#define FRAME_PREV_FSMODE(F) ((F)->output_data.w32->prev_fsmode)
......
......@@ -734,16 +734,6 @@ enum
#define FRAME_XIC_STYLE(f) ((f)->output_data.x->xic_style)
#define FRAME_XIC_FONTSET(f) ((f)->output_data.x->xic_xfs)
/* Value is the smallest width of any character in any font on frame F. */
#define FRAME_SMALLEST_CHAR_WIDTH(F) \
FRAME_DISPLAY_INFO(F)->smallest_char_width
/* Value is the smallest height of any font on frame F. */
#define FRAME_SMALLEST_FONT_HEIGHT(F) \
FRAME_DISPLAY_INFO(F)->smallest_font_height
/* X-specific scroll bar stuff. */
/* We represent scroll bars as lisp vectors. This allows us to place
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment