From 901049a6611e92b539e5fd2d661a9f0558a281dd Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Sun, 15 Sep 2013 11:28:38 +0400 Subject: [PATCH] * xterm.h (SCROLL_BAR_X_WIDGET, SET_SCROLL_BAR_X_WIDGET) [USE_X_TOOLKIT]: Define as such. * w32term.h (SCROLL_BAR_X_WIDGET, SET_SCROLL_BAR_X_WIDGET): Remove unused Xisms. --- src/ChangeLog | 4 ++++ src/w32term.h | 8 -------- src/xterm.h | 2 ++ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3473ec9ab0..4040681f7c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,9 +2,13 @@ * xterm.h (FRAME_X_SCREEN_NUMBER): Add comment. (BLACK_PIX_DEFAULT, WHITE_PIX_DEFAULT): Use FRAME_X_SCREEN_NUMBER. + (SCROLL_BAR_X_WIDGET, SET_SCROLL_BAR_X_WIDGET) [USE_X_TOOLKIT]: + Define as such. * frame.h (FRAME_SMALLEST_CHAR_WIDTH, FRAME_SMALLEST_FONT_HEIGHT): Define once here... * nsterm.h, w32term.h, xterm.h: ...and not here. + * w32term.h (SCROLL_BAR_X_WIDGET, SET_SCROLL_BAR_X_WIDGET): + Remove unused Xisms. 2013-09-14 Eli Zaretskii diff --git a/src/w32term.h b/src/w32term.h index 9c7134ddf1..6a49753a70 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -473,14 +473,6 @@ struct scroll_bar { #define SET_SCROLL_BAR_W32_WINDOW(ptr, id) \ (SCROLL_BAR_UNPACK ((ptr)->w32_window_low, (ptr)->w32_window_high, (intptr_t) id)) -/* Extract the X widget of the scroll bar from a struct scroll_bar. */ -#define SCROLL_BAR_X_WIDGET(ptr) \ - ((Widget) SCROLL_BAR_PACK ((ptr)->x_widget_low, (ptr)->x_widget_high)) - -/* Store a widget id in a struct scroll_bar. */ -#define SET_SCROLL_BAR_X_WIDGET(ptr, w) \ - (SCROLL_BAR_UNPACK ((ptr)->x_widget_low, (ptr)->x_widget_high, (int) w)) - /* Return the inside width of a vertical scroll bar, given the outside width. */ #define VERTICAL_SCROLL_BAR_INSIDE_WIDTH(f,width) \ diff --git a/src/xterm.h b/src/xterm.h index 4f6b545cb4..b7efee4b6c 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -796,6 +796,7 @@ struct scroll_bar /* Turning a lisp vector value into a pointer to a struct scroll_bar. */ #define XSCROLL_BAR(vec) ((struct scroll_bar *) XVECTOR (vec)) +#ifdef USE_X_TOOLKIT /* Extract the X widget of the scroll bar from a struct scroll_bar. XtWindowToWidget should be fast enough since Xt uses a hash table @@ -812,6 +813,7 @@ struct scroll_bar ptr->x_window = window; \ } while (0) +#endif /* USE_X_TOOLKIT */ /* Return the inside width of a vertical scroll bar, given the outside width. */ -- 2.20.1