Mercurial > emacs
comparison src/ChangeLog @ 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 | cf610b797357 |
| children | 2abe34cec6dc |
comparison
equal
deleted
inserted
replaced
| 64937:9ac98d57e0e7 | 64938:8355c7d6253c |
|---|---|
| 1 2005-08-13 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | |
| 2 | |
| 3 * gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function. | |
| 4 (xg_get_image_for_pixmap): Move some code to | |
| 5 xg_get_pixbuf_from_pix_and_mask, and call it. | |
| 6 | |
| 7 * gtkutil.h (xg_get_pixbuf_from_pix_and_mask): Declare. | |
| 8 | |
| 9 * xterm.c (x_wm_set_icon_pixmap): Call xg_get_pixbuf_from_pix_and_mask | |
| 10 to get an GTK icon and set it with GTK functions to avoid having GTK | |
| 11 override an icon set with just X functions. | |
| 12 | |
| 1 2005-08-11 Richard M. Stallman <rms@gnu.org> | 13 2005-08-11 Richard M. Stallman <rms@gnu.org> |
| 2 | 14 |
| 3 * image.c (syms_of_image): Init image_types here, and call define_image_type. | 15 * image.c (syms_of_image): Init image_types here, and call define_image_type. |
| 4 (init_image): Not here. | 16 (init_image): Not here. |
| 5 | 17 |