* xterm.c (x_create_toolkit_scroll_bar): Only set XtNbeNiceToColormap

to TRUE if depth of screen is < 16.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4368c6212015aa8a23ae3b459daf919280cc0d62..ba460cafa22b4e3b3ad3dde35effc67e557431cf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,11 +1,14 @@
 2010-08-02  Jan Djärv  <jan.h.d@swipnet.se>
 
+       * xterm.c (x_create_toolkit_scroll_bar): Only set XtNbeNiceToColormap
+       to TRUE if depth of screen is < 16.
+
        * gtkutil.c (hierarchy_ch_cb, qttip_cb): Do not define unless
        USE_GTK_TOOLTIP.
        (xg_prepare_tooltip): Return 0 unless USE_GTK_TOOLTIP
        (xg_show_tooltip, xg_hide_tooltip): Do nothing unless
        USE_GTK_TOOLTIP.
-       (xg_create_frame_widgets): Surrond tooltip-related code with ifdef
+       (xg_create_frame_widgets): Surround tooltip-related code with ifdef
        USE_GTK_TOOLTIP.
        (xg_free_frame_widgets): Don't delete ttip_* unless USE_GTK_TOOLTIP.
 

diff --git a/src/xterm.c b/src/xterm.c
index f003fc7648d3c090f481e898379307b938d5f752..1b2442bba3b9f11da862cdad7f4ded0273079ff8 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -4532,8 +4532,11 @@ x_create_toolkit_scroll_bar (struct frame *f, struct scroll_bar *bar)
       || f->output_data.x->scroll_bar_bottom_shadow_pixel == -1)
     /* We tried to allocate a color for the top/bottom shadow, and
        failed, so tell Xaw3d to use dithering instead.   */
+    /* But only if we have a small colormap.  Xaw3d can allocate nice
+       colors itself.  */
     {
-      XtSetArg (av[ac], XtNbeNiceToColormap, True);
+      XtSetArg (av[ac], XtNbeNiceToColormap,
+                DefaultDepthOfScreen (FRAME_X_SCREEN (f)) < 16);
       ++ac;
     }
   else