comparison src/glyphs-msw.h @ 424:11054d720c21 r21-2-20

Import from CVS: tag r21-2-20
author cvs
date Mon, 13 Aug 2007 11:26:11 +0200
parents 697ef44129c6
children
comparison
equal deleted inserted replaced
423:28d9c139be4c 424:11054d720c21
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 bitmap; 37 HBITMAP* bitmaps;
38 HBITMAP mask;
39 HICON icon; 38 HICON icon;
40 }; 39 };
41 40
42 #define MSWINDOWS_IMAGE_INSTANCE_DATA(i) \ 41 #define MSWINDOWS_IMAGE_INSTANCE_DATA(i) \
43 ((struct mswindows_image_instance_data *) (i)->data) 42 ((struct mswindows_image_instance_data *) (i)->data)
44 43
45 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \ 44 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \
46 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmap) 45 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[0])
46 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i,slice) \
47 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[slice])
48 #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \
49 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps)
47 #define IMAGE_INSTANCE_MSWINDOWS_MASK(i) \ 50 #define IMAGE_INSTANCE_MSWINDOWS_MASK(i) \
48 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->mask) 51 (HBITMAP)(IMAGE_INSTANCE_PIXMAP_MASK (i))
49 #define IMAGE_INSTANCE_MSWINDOWS_ICON(i) \ 52 #define IMAGE_INSTANCE_MSWINDOWS_ICON(i) \
50 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->icon) 53 (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->icon)
51 54
52 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \ 55 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \
53 IMAGE_INSTANCE_MSWINDOWS_BITMAP (XIMAGE_INSTANCE (i)) 56 IMAGE_INSTANCE_MSWINDOWS_BITMAP (XIMAGE_INSTANCE (i))
57 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i,slice) \
58 IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE (XIMAGE_INSTANCE (i,slice))
59 #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \
60 IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES (XIMAGE_INSTANCE (i))
54 #define XIMAGE_INSTANCE_MSWINDOWS_MASK(i) \ 61 #define XIMAGE_INSTANCE_MSWINDOWS_MASK(i) \
55 IMAGE_INSTANCE_MSWINDOWS_MASK (XIMAGE_INSTANCE (i)) 62 IMAGE_INSTANCE_MSWINDOWS_MASK (XIMAGE_INSTANCE (i))
56 #define XIMAGE_INSTANCE_MSWINDOWS_ICON(i) \ 63 #define XIMAGE_INSTANCE_MSWINDOWS_ICON(i) \
57 IMAGE_INSTANCE_MSWINDOWS_ICON (XIMAGE_INSTANCE (i)) 64 IMAGE_INSTANCE_MSWINDOWS_ICON (XIMAGE_INSTANCE (i))
58 65
76 (HWND) (IMAGE_INSTANCE_SUBWINDOW_ID (i)) 83 (HWND) (IMAGE_INSTANCE_SUBWINDOW_ID (i))
77 84
78 #define XWIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \ 85 #define XWIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \
79 WIDGET_INSTANCE_MSWINDOWS_HANDLE (XIMAGE_INSTANCE (i)) 86 WIDGET_INSTANCE_MSWINDOWS_HANDLE (XIMAGE_INSTANCE (i))
80 87
88 struct mswindows_subwindow_data
89 {
90 HWND clip_window;
91 };
92
93 #define MSWINDOWS_SUBWINDOW_DATA(i) \
94 ((struct mswindows_subwindow_data *) (i)->data)
95
96 #define IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW(i) \
97 (MSWINDOWS_SUBWINDOW_DATA (i)->clip_window)
98
99 #define XIMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW(i) \
100 IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (XIMAGE_INSTANCE (i))
101
81 #endif /* HAVE_MS_WINDOWS */ 102 #endif /* HAVE_MS_WINDOWS */
82 #endif /* _XEMACS_GLYPHS_MSW_H_ */ 103 #endif /* _XEMACS_GLYPHS_MSW_H_ */