Mercurial > hg > xemacs-beta
comparison src/glyphs-msw.h @ 771:943eaba38521
[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 |
comparison
equal
deleted
inserted
replaced
770:336a418893b5 | 771:943eaba38521 |
---|---|
23 #ifndef INCLUDED_glyphs_msw_h_ | 23 #ifndef INCLUDED_glyphs_msw_h_ |
24 #define INCLUDED_glyphs_msw_h_ | 24 #define INCLUDED_glyphs_msw_h_ |
25 | 25 |
26 #ifdef HAVE_MS_WINDOWS | 26 #ifdef HAVE_MS_WINDOWS |
27 | 27 |
28 #include <windows.h> | 28 #include "syswindows.h" |
29 #include "glyphs.h" | 29 #include "glyphs.h" |
30 | 30 |
31 /**************************************************************************** | 31 /**************************************************************************** |
32 * Image-Instance Object * | 32 * Image-Instance Object * |
33 ****************************************************************************/ | 33 ****************************************************************************/ |
34 | 34 |
35 struct mswindows_image_instance_data | 35 struct mswindows_image_instance_data |
36 { | 36 { |
37 HBITMAP* bitmaps; | 37 HBITMAP *bitmaps; |
38 HICON icon; | 38 HICON icon; |
39 int real_width, real_height; | 39 int real_width, real_height; |
40 }; | 40 }; |
41 | 41 |
42 #define MSWINDOWS_IMAGE_INSTANCE_DATA(i) \ | 42 #define MSWINDOWS_IMAGE_INSTANCE_DATA(i) \ |
47 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i,slice) \ | 47 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i,slice) \ |
48 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[slice]) | 48 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[slice]) |
49 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \ | 49 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \ |
50 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps) | 50 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps) |
51 #define IMAGE_INSTANCE_MSWINDOWS_MASK(i) \ | 51 #define IMAGE_INSTANCE_MSWINDOWS_MASK(i) \ |
52 (*(HBITMAP*)&(IMAGE_INSTANCE_PIXMAP_MASK (i))) /* Make it lvalue */ | 52 (* (HBITMAP *) &(IMAGE_INSTANCE_PIXMAP_MASK (i))) /* Make it lvalue */ |
53 #define IMAGE_INSTANCE_MSWINDOWS_ICON(i) \ | 53 #define IMAGE_INSTANCE_MSWINDOWS_ICON(i) \ |
54 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->icon) | 54 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->icon) |
55 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_WIDTH(i) \ | 55 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_WIDTH(i) \ |
56 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_width) | 56 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_width) |
57 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_HEIGHT(i) \ | 57 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_HEIGHT(i) \ |
58 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_height) | 58 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_height) |
59 | 59 |
60 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \ | 60 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \ |
61 IMAGE_INSTANCE_MSWINDOWS_BITMAP (XIMAGE_INSTANCE (i)) | 61 IMAGE_INSTANCE_MSWINDOWS_BITMAP (XIMAGE_INSTANCE (i)) |
62 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i,slice) \ | 62 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i, slice) \ |
63 IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE (XIMAGE_INSTANCE (i,slice)) | 63 IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE (XIMAGE_INSTANCE (i, slice)) |
64 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \ | 64 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \ |
65 IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES (XIMAGE_INSTANCE (i)) | 65 IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES (XIMAGE_INSTANCE (i)) |
66 #define XIMAGE_INSTANCE_MSWINDOWS_MASK(i) \ | 66 #define XIMAGE_INSTANCE_MSWINDOWS_MASK(i) \ |
67 IMAGE_INSTANCE_MSWINDOWS_MASK (XIMAGE_INSTANCE (i)) | 67 IMAGE_INSTANCE_MSWINDOWS_MASK (XIMAGE_INSTANCE (i)) |
68 #define XIMAGE_INSTANCE_MSWINDOWS_ICON(i) \ | 68 #define XIMAGE_INSTANCE_MSWINDOWS_ICON(i) \ |
69 IMAGE_INSTANCE_MSWINDOWS_ICON (XIMAGE_INSTANCE (i)) | 69 IMAGE_INSTANCE_MSWINDOWS_ICON (XIMAGE_INSTANCE (i)) |
70 | 70 |
71 int | 71 int |
72 mswindows_resize_dibitmap_instance (Lisp_Image_Instance* ii, | 72 mswindows_resize_dibitmap_instance (Lisp_Image_Instance *ii, |
73 struct frame* f, | 73 struct frame *f, |
74 int newx, int newy); | 74 int newx, int newy); |
75 HBITMAP | 75 HBITMAP |
76 mswindows_create_resized_bitmap (Lisp_Image_Instance* ii, | 76 mswindows_create_resized_bitmap (Lisp_Image_Instance *ii, |
77 struct frame* f, | 77 struct frame *f, |
78 int newx, int newy); | 78 int newx, int newy); |
79 HBITMAP | 79 HBITMAP |
80 mswindows_create_resized_mask (Lisp_Image_Instance* ii, | 80 mswindows_create_resized_mask (Lisp_Image_Instance *ii, |
81 struct frame* f, | 81 struct frame *f, |
82 int newx, int newy); | 82 int newx, int newy); |
83 void | 83 void |
84 mswindows_initialize_image_instance_icon (Lisp_Image_Instance* image, | 84 mswindows_initialize_image_instance_icon (Lisp_Image_Instance *image, |
85 int cursor); | 85 int cursor); |
86 | 86 |
87 #define WIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \ | 87 #define WIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \ |
88 (HWND) (IMAGE_INSTANCE_SUBWINDOW_ID (i)) | 88 (HWND) (IMAGE_INSTANCE_SUBWINDOW_ID (i)) |
89 | 89 |