diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-09-13 19:03:51 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-09-13 19:03:51 +0400 |
| commit | aad3612f9eb7280bd4db8ee697186e75b1e82765 (patch) | |
| tree | fd251b7978e9a570a6b66c93a43b0021bac0c7b7 /src/w32term.h | |
| parent | 7830899f39515bcb4938715ebf58d1ba855deb41 (diff) | |
Unify FRAME_window_system_DISPLAY_INFO macros between all ports.
All of them are replaced with FRAME_DISPLAY_INFO, defined in
each port to reference the port-specific window system data.
* msdos.h (FRAME_X_DISPLAY_INFO): Remove.
(FRAME_DISPLAY_INFO): Define.
* w32term.h (FRAME_W32_DISPLAY_INFO, FRAME_X_DISPLAY_INFO): Remove.
(FRAME_DISPLAY_INFO): Define. Adjust users.
* xterm.h (FRAME_X_DISPLAY_INFO): Remove.
(FRAME_DISPLAY_INFO): Define. Adjust users.
* frame.h (FRAME_RES_X, FRAME_RES_Y): Unify.
* font.c, frame.c, gtkutil.c, image.c, menu.c, msdos.c, nsfns.m:
* nsfont.m, nsterm.m, w32fns.c, w32font.c, w32menu.c, w32term.c:
* w32xfns.c, widget.c, xdisp.c, xfaces.c, xfns.c, xfont.c, xmenu.c:
* xselect.c, xterm.c: All related users changed.
Diffstat (limited to 'src/w32term.h')
| -rw-r--r-- | src/w32term.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/w32term.h b/src/w32term.h index b4818f69ae..68c0245acb 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -379,8 +379,7 @@ extern struct w32_output w32term_display; #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.w32->baseline_offset) /* This gives the w32_display_info structure for the display F is on. */ -#define FRAME_W32_DISPLAY_INFO(f) (&one_w32_display_info) -#define FRAME_X_DISPLAY_INFO(f) (&one_w32_display_info) +#define FRAME_DISPLAY_INFO(f) (&one_w32_display_info) /* This is the `Display *' which frame F is on. */ #define FRAME_X_DISPLAY(f) (0) @@ -388,12 +387,12 @@ extern struct w32_output w32term_display; /* Value is the smallest width of any character in any font on frame F. */ #define FRAME_SMALLEST_CHAR_WIDTH(F) \ - FRAME_W32_DISPLAY_INFO(F)->smallest_char_width + 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_W32_DISPLAY_INFO(F)->smallest_font_height + 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) |