aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-11-01 11:25:01 +0000
committerGerd Moellmann2001-11-01 11:25:01 +0000
commit7b49b9d282a2a06fccb9abdf1ddfc8726445769b (patch)
tree88ba4237d0b923125f70458e1e36b1ffce9a7b21 /src
parent43f7c3ea0cc6872ac018531122f17801f0baf825 (diff)
downloademacs-7b49b9d282a2a06fccb9abdf1ddfc8726445769b.tar.gz
emacs-7b49b9d282a2a06fccb9abdf1ddfc8726445769b.zip
(x_scroll_bar_create): Check for width and height > 0.
(XTset_vertical_scroll_bar): Likewise.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xterm.c11
2 files changed, 9 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 05553b4c9bb..d0523eb522e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12001-11-01 Gerd Moellmann <gerd@gnu.org> 12001-11-01 Gerd Moellmann <gerd@gnu.org>
2 2
3 * xterm.c (x_scroll_bar_create): Check for width and height > 0.
4 (XTset_vertical_scroll_bar): Likewise.
5
3 * xfns.c (x_build_heuristic_mask): Use four_corners_best 6 * xfns.c (x_build_heuristic_mask): Use four_corners_best
4 instead of IMAGE_BACKGROUND. 7 instead of IMAGE_BACKGROUND.
5 8
diff --git a/src/xterm.c b/src/xterm.c
index 706ca1463b9..83da1b5aec0 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8956,9 +8956,10 @@ x_scroll_bar_create (w, top, left, width, height)
8956 /* Clear the area of W that will serve as a scroll bar. This is 8956 /* Clear the area of W that will serve as a scroll bar. This is
8957 for the case that a window has been split horizontally. In 8957 for the case that a window has been split horizontally. In
8958 this case, no clear_frame is generated to reduce flickering. */ 8958 this case, no clear_frame is generated to reduce flickering. */
8959 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 8959 if (width > 0 && height > 0)
8960 left, top, width, 8960 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
8961 window_box_height (w), False); 8961 left, top, width,
8962 window_box_height (w), False);
8962 8963
8963 window = XCreateWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 8964 window = XCreateWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
8964 /* Position and size of scroll bar. */ 8965 /* Position and size of scroll bar. */
@@ -9201,7 +9202,7 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
9201 /* Does the scroll bar exist yet? */ 9202 /* Does the scroll bar exist yet? */
9202 if (NILP (w->vertical_scroll_bar)) 9203 if (NILP (w->vertical_scroll_bar))
9203 { 9204 {
9204 if (width && height) 9205 if (width > 0 && height > 0)
9205 { 9206 {
9206 BLOCK_INPUT; 9207 BLOCK_INPUT;
9207 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 9208 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
@@ -9233,7 +9234,7 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
9233 9234
9234 /* Since toolkit scroll bars are smaller than the space reserved 9235 /* Since toolkit scroll bars are smaller than the space reserved
9235 for them on the frame, we have to clear "under" them. */ 9236 for them on the frame, we have to clear "under" them. */
9236 if (width && height) 9237 if (width > 0 && height > 0)
9237 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 9238 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
9238 left, top, width, height, False); 9239 left, top, width, height, False);
9239 9240