From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 2 Nov 2004 16:25:50 +0000 (+0000)
Subject: * xterm.c (x_window_to_scroll_bar): Only call
X-Git-Tag: ttn-vms-21-2-B4~4224
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a11e1dce8fc37f32ffa428032e868369c7a6aa0f;p=emacs.git

* xterm.c (x_window_to_scroll_bar): Only call
xg_get_scroll_id_for_window if toolkit scroll bars are used.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 153c871d917..b7ae4e8148f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2004-11-02  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
+	* xterm.c (x_window_to_scroll_bar): Only call
+	xg_get_scroll_id_for_window if toolkit scroll bars are used.
+
 	* gtkutil.c (xg_get_file_with_chooser): Use GTK_STOCK_OK instead
 	of save.
 
diff --git a/src/xterm.c b/src/xterm.c
index 54ee4014e8c..df99a8667f8 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3924,9 +3924,9 @@ x_window_to_scroll_bar (display, window_id)
 {
   Lisp_Object tail;
 
-#ifdef USE_GTK
+#if defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)
   window_id = (Window) xg_get_scroll_id_for_window (display, window_id);
-#endif /* USE_GTK */
+#endif /* USE_GTK  && USE_TOOLKIT_SCROLL_BARS */
 
   for (tail = Vframe_list;
        XGCTYPE (tail) == Lisp_Cons;