From: Jan Djärv Date: Mon, 2 Aug 2010 14:23:06 +0000 (+0200) Subject: * xterm.c (x_create_toolkit_scroll_bar): Only set XtNbeNiceToColormap X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~49^2~74 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4d464ae4d6970592730a50ed716499c46931a5a4;p=emacs.git * 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 4368c621201..ba460cafa22 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,11 +1,14 @@ 2010-08-02 Jan Djärv + * 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 f003fc7648d..1b2442bba3b 100644 --- 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