Mercurial > hg > xemacs-beta

diff src/glyphs-msw.h @ 272:c5d627a313b1 r21-0b34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b34
author cvs
date Mon, 13 Aug 2007 10:28:48 +0200
parents b2472a1930f2
children 90d73dddcdc4
line wrap: on
line diff
--- a/src/glyphs-msw.h	Mon Aug 13 10:27:41 2007 +0200
+++ b/src/glyphs-msw.h	Mon Aug 13 10:28:48 2007 +0200
@@ -38,19 +38,26 @@
 struct mswindows_image_instance_data
 {
   HBITMAP bitmap;
+  HBITMAP mask;
+  HICON icon;
 };
 
 #define MSWINDOWS_IMAGE_INSTANCE_DATA(i) \
 ((struct mswindows_image_instance_data *) (i)->data)
 
 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \
-(MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmap)
-#define IMAGE_INSTANCE_MSWINDOWS_MASK(i) 0
+     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmap)
+#define IMAGE_INSTANCE_MSWINDOWS_MASK(i) \
+     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->mask)
+#define IMAGE_INSTANCE_MSWINDOWS_ICON(i) \
+     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->icon)
 
 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \
   IMAGE_INSTANCE_MSWINDOWS_BITMAP (XIMAGE_INSTANCE (i))
 #define XIMAGE_INSTANCE_MSWINDOWS_MASK(i) \
   IMAGE_INSTANCE_MSWINDOWS_MASK (XIMAGE_INSTANCE (i))
+#define XIMAGE_INSTANCE_MSWINDOWS_ICON(i) \
+  IMAGE_INSTANCE_MSWINDOWS_ICON (XIMAGE_INSTANCE (i))
 
 #endif /* HAVE_MS_WINDOWS */
 #endif /* _XEMACS_GLYPHS_MSW_H_ */