Merge from emacs-24; up to 2014-07-26T12:14:42Z!schwab@linux-m68k.org

[gnu-emacs] / src / window.h

diff --git a/src/window.h b/src/window.h
index 7e1c7d619b94ea945e4d9ca83b56fbb8c2aa1713..ea5dddc9fc8b4c49cec6c962c70c895c185309b8 100644 (file)
--- a/src/window.h
+++ b/src/window.h
@@ -785,11 +785,17 @@ wset_next_buffers (struct window *w, Lisp_Object val)
   (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (W)          \
    || WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (W))
 
-/* Say whether horizontal scroll bars are currently enabled for window
-   W.  Horizontal scrollbars exist for toolkit versions only.  */
 #if (defined (HAVE_WINDOW_SYSTEM)                                      \
      && ((defined (USE_TOOLKIT_SCROLL_BARS) && !defined (HAVE_NS))     \
         || defined (HAVE_NTGUI)))
+# define USE_HORIZONTAL_SCROLL_BARS true
+#else
+# define USE_HORIZONTAL_SCROLL_BARS false
+#endif
+
+/* Say whether horizontal scroll bars are currently enabled for window
+   W.  Horizontal scrollbars exist for toolkit versions only.  */
+#if USE_HORIZONTAL_SCROLL_BARS
 #define WINDOW_HAS_HORIZONTAL_SCROLL_BAR(W)                    \
   ((WINDOW_PSEUDO_P (W) || MINI_NON_ONLY_WINDOW_P (W))         \
    ? false                                                     \