Mercurial > emacs
changeset 64938:8355c7d6253c
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
(xg_get_image_for_pixmap): Move some code to
xg_get_pixbuf_from_pix_and_mask, and call it.
* gtkutil.h (xg_get_pixbuf_from_pix_and_mask): Declare.
* xterm.c (x_wm_set_icon_pixmap): Call xg_get_pixbuf_from_pix_and_mask
to get an GTK icon and set it with GTK functions to avoid having GTK
override an icon set with just X functions.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Sat, 13 Aug 2005 09:49:10 +0000 |
| parents | 9ac98d57e0e7 |
| children | 016c8310240c |
| files | src/ChangeLog |
| diffstat | 1 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Aug 13 09:48:36 2005 +0000 +++ b/src/ChangeLog Sat Aug 13 09:49:10 2005 +0000 @@ -1,3 +1,15 @@ +2005-08-13 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function. + (xg_get_image_for_pixmap): Move some code to + xg_get_pixbuf_from_pix_and_mask, and call it. + + * gtkutil.h (xg_get_pixbuf_from_pix_and_mask): Declare. + + * xterm.c (x_wm_set_icon_pixmap): Call xg_get_pixbuf_from_pix_and_mask + to get an GTK icon and set it with GTK functions to avoid having GTK + override an icon set with just X functions. + 2005-08-11 Richard M. Stallman <rms@gnu.org> * image.c (syms_of_image): Init image_types here, and call define_image_type.