diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2014-08-04 18:47:27 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2014-08-04 18:47:27 +0200 |
| commit | 4a75c94d14f7a3c50014d1cc12ee519eb955c1ed (patch) | |
| tree | 73a26f58dc3568e35872b33dcd88aa411ef9c56a /src/window.h | |
| parent | 44a651f0f2e1668bdbbacca3bf5d405c34e67ff2 (diff) | |
| download | emacs-4a75c94d14f7a3c50014d1cc12ee519eb955c1ed.tar.gz emacs-4a75c94d14f7a3c50014d1cc12ee519eb955c1ed.tar.bz2 emacs-4a75c94d14f7a3c50014d1cc12ee519eb955c1ed.zip | |
Fix scroll bar handling for non-toolkit builds.
* frame.h (FRAME_HAS_HORIZONTAL_SCROLL_BARS): Condition
correctly according to toolkit used.
* frame.c (make_initial_frame, make_terminal_frame)
(x_set_horizontal_scroll_bars, x_set_scroll_bar_height)
(Vdefault_frame_horizontal_scroll_bars): Correctly condition
assignments according to presence of toolkit scrollbars.
* window.h (WINDOW_HAS_HORIZONTAL_SCROLL_BAR): Condition
correctly according to toolkit used.
* window.c (set_window_scroll_bars): Set horizontal scroll bar
only if toolkit supports it.
* w32term.c (w32_redeem_scroll_bar): Always redeem scroll bar if
present.
* xterm.c (x_scroll_bar_create): Initialize horizontal slot for
non-toolkit builds.
(XTredeem_scroll_bar): Always redeem scroll bar if present.
Diffstat (limited to 'src/window.h')
| -rw-r--r-- | src/window.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/window.h b/src/window.h index cdf8da93138..7e1c7d619b9 100644 --- a/src/window.h +++ b/src/window.h @@ -787,7 +787,9 @@ wset_next_buffers (struct window *w, Lisp_Object val) /* 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 (HAVE_WINDOW_SYSTEM) \ + && ((defined (USE_TOOLKIT_SCROLL_BARS) && !defined (HAVE_NS)) \ + || defined (HAVE_NTGUI))) #define WINDOW_HAS_HORIZONTAL_SCROLL_BAR(W) \ ((WINDOW_PSEUDO_P (W) || MINI_NON_ONLY_WINDOW_P (W)) \ ? false \ |