--- a/src/glyphs-msw.h	Mon Aug 13 11:19:22 2007 +0200
+++ b/src/glyphs-msw.h	Mon Aug 13 11:20:41 2007 +0200
@@ -20,8 +20,8 @@
 
 /* Synched up with:  Not in FSF. */
 
-#ifndef INCLUDED_glyphs_msw_h_
-#define INCLUDED_glyphs_msw_h_
+#ifndef _XEMACS_GLYPHS_MSW_H_
+#define _XEMACS_GLYPHS_MSW_H_
 
 #ifdef HAVE_MS_WINDOWS
 
@@ -34,54 +34,42 @@
 
 struct mswindows_image_instance_data
 {
-  HBITMAP* bitmaps;
+  HBITMAP bitmap;
+  HBITMAP mask;
   HICON icon;
-  int real_width, real_height;
 };
 
 #define MSWINDOWS_IMAGE_INSTANCE_DATA(i) \
 ((struct mswindows_image_instance_data *) (i)->data)
 
 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \
-     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[0])
-#define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i,slice) \
-     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[slice])
-#define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \
-     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps)
+     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmap)
 #define IMAGE_INSTANCE_MSWINDOWS_MASK(i) \
-     (*(HBITMAP*)&(IMAGE_INSTANCE_PIXMAP_MASK (i)))		/* Make it lvalue */
+     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->mask)
 #define IMAGE_INSTANCE_MSWINDOWS_ICON(i) \
      (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->icon)
-#define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_WIDTH(i) \
-     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_width)
-#define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_HEIGHT(i) \
-     (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_height)
 
 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \
   IMAGE_INSTANCE_MSWINDOWS_BITMAP (XIMAGE_INSTANCE (i))
-#define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i,slice) \
-  IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE (XIMAGE_INSTANCE (i,slice))
-#define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \
-  IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES (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))
 
 int
-mswindows_resize_dibitmap_instance (Lisp_Image_Instance* ii,
+mswindows_resize_dibitmap_instance (struct Lisp_Image_Instance* ii,
 				    struct frame* f,
 				    int newx, int newy);
 HBITMAP
-mswindows_create_resized_bitmap (Lisp_Image_Instance* ii,
+mswindows_create_resized_bitmap (struct Lisp_Image_Instance* ii,
 				 struct frame* f,
 				 int newx, int newy);
 HBITMAP
-mswindows_create_resized_mask (Lisp_Image_Instance* ii,
+mswindows_create_resized_mask (struct Lisp_Image_Instance* ii,
 			       struct frame* f,
 			       int newx, int newy);
 void
-mswindows_initialize_image_instance_icon (Lisp_Image_Instance* image,
+mswindows_initialize_image_instance_icon (struct Lisp_Image_Instance* image,
 					  int cursor);
 
 #define WIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \
@@ -90,27 +78,5 @@
 #define XWIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \
   WIDGET_INSTANCE_MSWINDOWS_HANDLE (XIMAGE_INSTANCE (i))
 
-struct mswindows_subwindow_data
-{
-  HWND clip_window;
-};
-
-#define MSWINDOWS_SUBWINDOW_DATA(i) \
-  ((struct mswindows_subwindow_data *) (i)->data)
-#define IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW(i) \
-     (MSWINDOWS_SUBWINDOW_DATA (i)->clip_window)
-
-#define XIMAGE_INSTANCE_MSWINDOWS_SUBWINDOW_DATA(i) \
-  MSWINDOWS_SUBWINDOW_DATA (XIMAGE_INSTANCE (i))
-#define XIMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW(i) \
-  IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (XIMAGE_INSTANCE (i))
-
-#define DOMAIN_MSWINDOWS_HANDLE(domain) \
-  ((IMAGE_INSTANCEP (domain) && \
-  XIMAGE_INSTANCE_MSWINDOWS_SUBWINDOW_DATA (domain)) ? \
-   XWIDGET_INSTANCE_MSWINDOWS_HANDLE (domain) : \
-   FRAME_MSWINDOWS_HANDLE (DOMAIN_XFRAME (domain)))
-
 #endif /* HAVE_MS_WINDOWS */
-
-#endif /* INCLUDED_glyphs_msw_h_ */
+#endif /* _XEMACS_GLYPHS_MSW_H_ */