Mercurial > hg > xemacs-beta

diff src/glyphs-msw.h @ 771:943eaba38521

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents abe6d1db359e
children 6728e641994e
line wrap: on
line diff
--- a/src/glyphs-msw.h	Fri Mar 08 13:33:14 2002 +0000
+++ b/src/glyphs-msw.h	Wed Mar 13 08:54:06 2002 +0000
@@ -25,7 +25,7 @@
 
 #ifdef HAVE_MS_WINDOWS
 
-#include <windows.h>
+#include "syswindows.h"
 #include "glyphs.h"
 
 /****************************************************************************
@@ -34,7 +34,7 @@
 
 struct mswindows_image_instance_data
 {
-  HBITMAP* bitmaps;
+  HBITMAP *bitmaps;
   HICON icon;
   int real_width, real_height;
 };
@@ -49,7 +49,7 @@
 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \
      (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps)
 #define IMAGE_INSTANCE_MSWINDOWS_MASK(i) \
-     (*(HBITMAP*)&(IMAGE_INSTANCE_PIXMAP_MASK (i)))		/* Make it lvalue */
+     (* (HBITMAP *) &(IMAGE_INSTANCE_PIXMAP_MASK (i)))		/* Make it lvalue */
 #define IMAGE_INSTANCE_MSWINDOWS_ICON(i) \
      (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->icon)
 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_WIDTH(i) \
@@ -59,8 +59,8 @@
 
 #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_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) \
@@ -69,19 +69,19 @@
   IMAGE_INSTANCE_MSWINDOWS_ICON (XIMAGE_INSTANCE (i))
 
 int
-mswindows_resize_dibitmap_instance (Lisp_Image_Instance* ii,
-				    struct frame* f,
+mswindows_resize_dibitmap_instance (Lisp_Image_Instance *ii,
+				    struct frame *f,
 				    int newx, int newy);
 HBITMAP
-mswindows_create_resized_bitmap (Lisp_Image_Instance* ii,
-				 struct frame* f,
+mswindows_create_resized_bitmap (Lisp_Image_Instance *ii,
+				 struct frame *f,
 				 int newx, int newy);
 HBITMAP
-mswindows_create_resized_mask (Lisp_Image_Instance* ii,
-			       struct frame* f,
+mswindows_create_resized_mask (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 (Lisp_Image_Instance *image,
 					  int cursor);
 
 #define WIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \