# HG changeset patch # User Richard M. Stallman # Date 830893256 0 # Node ID 21673af29c3214a2b2e3d1af0f012c9fc4123281 # Parent a152ab5c09b07ec6875fdc9871dd4215618ee93a [USE_X_TOOLKIT]: Include X11/Shell.h. (x_wm_set_icon_pixmap) [USE_X_TOOLKIT]: Tell widget the new pixmap. diff -r a152ab5c09b0 -r 21673af29c32 src/xterm.c --- a/src/xterm.c Tue Apr 30 16:11:53 1996 +0000 +++ b/src/xterm.c Tue Apr 30 19:40:56 1996 +0000 @@ -85,6 +85,10 @@ #include "intervals.h" #ifdef USE_X_TOOLKIT +#include +#endif + +#ifdef USE_X_TOOLKIT extern void free_frame_menubar (); extern FRAME_PTR x_menubar_window_to_frame (); #if (XtSpecificationRelease >= 5) && !defined(NO_EDITRES) @@ -5727,6 +5731,8 @@ struct frame *f; int pixmap_id; { + Pixmap icon_pixmap; + #ifdef USE_X_TOOLKIT Window window = XtWindow (f->output_data.x->widget); #else @@ -5735,7 +5741,7 @@ if (pixmap_id > 0) { - Pixmap icon_pixmap = x_bitmap_pixmap (f, pixmap_id); + icon_pixmap = x_bitmap_pixmap (f, pixmap_id); f->output_data.x->wm_hints.icon_pixmap = icon_pixmap; } else @@ -5754,8 +5760,20 @@ #endif } +#ifdef USE_X_TOOLKIT /* same as in x_wm_set_window_state. */ + + { + Arg al[1]; + XtSetArg (al[0], XtNiconPixmap, icon_pixmap); + XtSetValues (f->output_data.x->widget, al, 1); + } + +#else /* not USE_X_TOOLKIT */ + f->output_data.x->wm_hints.flags |= IconPixmapHint; XSetWMHints (FRAME_X_DISPLAY (f), window, &f->output_data.x->wm_hints); + +#endif /* not USE_X_TOOLKIT */ } x_wm_set_icon_position (f, icon_x, icon_y)