[USE_TOOLKIT_SCROLL_BARS && USE_MOTIF]: Don't include

SscrollBarP.h.

2 files changed, 5 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0d651b834c7..8a81d0fa629 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-03-13  Gerd Moellmann  <gerd@gnu.org>
 
+        * xterm.c [USE_TOOLKIT_SCROLL_BARS && USE_MOTIF]: Don't include
+        SscrollBarP.h.
+        
         * xterm.c (x_set_toolkit_scroll_bar_thumb) [USE_MOTIF]: Don't
         access private scroll bar data; it's no longer necessary with
         contemporary LessTif.
diff --git a/src/xterm.c b/src/xterm.c
index b064426b1d5..eaecea54102 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -117,7 +117,6 @@ extern void _XEditResCheckMessages ();
 #if defined USE_MOTIF
 #include <Xm/Xm.h>              /* for LESSTIF_VERSION */
 #include <Xm/ScrollBar.h>
-#include <Xm/ScrollBarP.h>
 #else /* !USE_MOTIF i.e. use Xaw */
 
 #ifdef HAVE_XAW3D
@@ -9953,10 +9952,10 @@ XTread_socket (sd, bufp, numchars, expected)
               f = x_any_window_to_frame (dpyinfo, event.xkey.window);
 
 #if defined USE_MOTIF && defined USE_TOOLKIT_SCROLL_BARS
-              /* I couldn't find a way to prevent LessTif scroll bars
-                 from consuming key events.  */
               if (f == 0)
                 {
+                  /* Scroll bars consume key events, but we want
+                     the keys to go to the scroll bar's frame.  */
                   Widget widget = XtWindowToWidget (dpyinfo->display,
                                                     event.xkey.window);
                   if (widget && XmIsScrollBar (widget))