]> git.eshelyaron.com Git - emacs.git/commit
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
authorJan Djärv <jan.h.d@swipnet.se>
Sat, 13 Aug 2005 09:49:10 +0000 (09:49 +0000)
committerJan Djärv <jan.h.d@swipnet.se>
Sat, 13 Aug 2005 09:49:10 +0000 (09:49 +0000)
commit6c7eb7212c99c54a6169dc0a6dc4a8a7f151407a
tree6221306e285b0ff95e4b945e527da2d94e2c77d0
parentcb515a21c74f594bba6c8b917d271b1eeeacdf36
* 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.
src/ChangeLog