[Emacs-diffs] master e6d8f70: Undo previous changes in non-toolkit scroll bar drawing.

[YAMAMOTO Mitsuharu]

branch: master
commit e6d8f700571967f69e61692ac76c98e24db52751
Author: YAMAMOTO Mitsuharu <address@hidden>
Commit: YAMAMOTO Mitsuharu <address@hidden>

    Undo previous changes in non-toolkit scroll bar drawing.
    
    * src/xterm.c (x_scroll_bar_set_handle, x_scroll_bar_expose)
    [!USE_TOOLKIT_SCROLL_BARS]: Draw into scroll bar window.  (Bug#20668)
---
 src/xterm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index 17c1a64..25c0d87 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6409,7 +6409,7 @@ x_scroll_bar_set_handle (struct scroll_bar *bar, int 
start, int end,
                      f->output_data.x->scroll_bar_foreground_pixel);
 
     /* Draw the handle itself.  */
-    x_fill_rectangle (f, gc,
+    XFillRectangle (FRAME_X_DISPLAY (f), w, gc,
                    /* x, y, width, height */
                    VERTICAL_SCROLL_BAR_LEFT_BORDER,
                    VERTICAL_SCROLL_BAR_TOP_BORDER + start,
@@ -6884,7 +6884,7 @@ x_scroll_bar_expose (struct scroll_bar *bar, const XEvent 
*event)
                    f->output_data.x->scroll_bar_foreground_pixel);
 
   /* Draw a one-pixel border just inside the edges of the scroll bar.  */
-  x_draw_rectangle (f, gc,
+  XDrawRectangle (FRAME_X_DISPLAY (f), w, gc,
                  /* x, y, width, height */
                  0, 0, bar->width - 1, bar->height - 1);