=== modified file 'src/frame.c' --- src/frame.c 2014-08-01 00:04:52 +0000 +++ src/frame.c 2014-08-01 12:25:36 +0000 @@ -3793,7 +3793,9 @@ void x_set_horizontal_scroll_bars (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { -#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI) +#if defined (USE_X_TOOLKIT) \ + || (defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)) \ + || defined (HAVE_NTGUI) if ((NILP (arg) && FRAME_HAS_HORIZONTAL_SCROLL_BARS (f)) || (!NILP (arg) && !FRAME_HAS_HORIZONTAL_SCROLL_BARS (f))) { @@ -3844,7 +3846,9 @@ void x_set_scroll_bar_height (struct frame *f, Lisp_Object arg, Lisp_Object oldval) { -#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI) +#if defined (USE_X_TOOLKIT) \ + || (defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)) \ + || defined (HAVE_NTGUI) int unit = FRAME_LINE_HEIGHT (f); if (NILP (arg)) === modified file 'src/frame.h' --- src/frame.h 2014-07-28 08:07:55 +0000 +++ src/frame.h 2014-08-01 12:56:37 +0000 @@ -852,11 +852,17 @@ #define FRAME_VERTICAL_SCROLL_BAR_TYPE(f) ((f)->vertical_scroll_bar_type) #define FRAME_HAS_VERTICAL_SCROLL_BARS(f) \ ((f)->vertical_scroll_bar_type != vertical_scroll_bar_none) -#define FRAME_HAS_HORIZONTAL_SCROLL_BARS(f) \ +#if defined (USE_X_TOOLKIT) \ + || (defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)) \ + || defined (HAVE_NTGUI) +#define FRAME_HAS_HORIZONTAL_SCROLL_BARS(f) \ ((f)->horizontal_scroll_bars) -#define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT(f) \ +#else +#define FRAME_HAS_HORIZONTAL_SCROLL_BARS(f) false +#endif +#define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT(f) \ ((f)->vertical_scroll_bar_type == vertical_scroll_bar_left) -#define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT(f) \ +#define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT(f) \ ((f)->vertical_scroll_bar_type == vertical_scroll_bar_right) #else /* not HAVE_WINDOW_SYSTEM */ === modified file 'src/window.h' --- src/window.h 2014-07-27 13:21:30 +0000 +++ src/window.h 2014-08-01 12:26:58 +0000 @@ -787,7 +787,9 @@ /* Say whether horizontal scroll bars are currently enabled for window W. Horizontal scrollbars exist for toolkit versions only. */ -#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI) +#if defined (USE_X_TOOLKIT) \ + || (defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)) \ + || defined (HAVE_NTGUI) #define WINDOW_HAS_HORIZONTAL_SCROLL_BAR(W) \ ((WINDOW_PSEUDO_P (W) || MINI_NON_ONLY_WINDOW_P (W)) \ ? false \