Mercurial > emacs
changeset 15117:21673af29c32
[USE_X_TOOLKIT]: Include X11/Shell.h.
(x_wm_set_icon_pixmap) [USE_X_TOOLKIT]: Tell widget the new pixmap.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 30 Apr 1996 19:40:56 +0000 |
| parents | a152ab5c09b0 |
| children | 77feea2e700b |
| files | src/xterm.c |
| diffstat | 1 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 <X11/Shell.h> +#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)