aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2001-05-03 17:49:33 +0000
committerEli Zaretskii2001-05-03 17:49:33 +0000
commit12949a7fae9566e60640b6b0e13eb95ab6d4657d (patch)
tree1a7da3449b62a02724dc7f645fea2adef3b215be /src
parenta779d21374a1fdb38f7a9ed3a664b7321d9af7bd (diff)
downloademacs-12949a7fae9566e60640b6b0e13eb95ab6d4657d.tar.gz
emacs-12949a7fae9566e60640b6b0e13eb95ab6d4657d.zip
(XTread_socket) <Expose> [!USE_TOOLKIT_SCROLL_BARS]: Fix
the change from 2001-04-30.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6dd403357e7..87d0a82077d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12001-05-03 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * xterm.c (XTread_socket) <Expose> [!USE_TOOLKIT_SCROLL_BARS]: Fix
4 the change from 2001-04-30.
5
12001-05-03 Gerd Moellmann <gerd@gnu.org> 62001-05-03 Gerd Moellmann <gerd@gnu.org>
2 7
3 * xfns.c (file_dialog_unmap_cb): New function. 8 * xfns.c (file_dialog_unmap_cb): New function.
diff --git a/src/xterm.c b/src/xterm.c
index a967774f57a..6bc3ced3a90 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10025,6 +10025,9 @@ XTread_socket (sd, bufp, numchars, expected)
10025 } 10025 }
10026 else 10026 else
10027 { 10027 {
10028#ifndef USE_TOOLKIT_SCROLL_BARS
10029 struct scroll_bar *bar;
10030#endif
10028#if defined USE_X_TOOLKIT && defined USE_LUCID 10031#if defined USE_X_TOOLKIT && defined USE_LUCID
10029 /* Submenus of the Lucid menu bar aren't widgets 10032 /* Submenus of the Lucid menu bar aren't widgets
10030 themselves, so there's no way to dispatch events 10033 themselves, so there's no way to dispatch events
@@ -10041,8 +10044,7 @@ XTread_socket (sd, bufp, numchars, expected)
10041 /* Dispatch event to the widget. */ 10044 /* Dispatch event to the widget. */
10042 goto OTHER; 10045 goto OTHER;
10043#else /* not USE_TOOLKIT_SCROLL_BARS */ 10046#else /* not USE_TOOLKIT_SCROLL_BARS */
10044 struct scroll_bar *bar 10047 bar = x_window_to_scroll_bar (event.xexpose.window);
10045 = x_window_to_scroll_bar (event.xexpose.window);
10046 10048
10047 if (bar) 10049 if (bar)
10048 x_scroll_bar_expose (bar, &event); 10050 x_scroll_bar_expose (bar, &event);