Mercurial > emacs

comparison src/dispextern.h @ 54362:64ae6f2c8fee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* dispextern.h (XImagePtr, XImagePtr_or_DC): Add typedefs. (image_background, image_background_transparent): Fix prototypes.
author Kim F. Storm <storm@cua.dk>
date Thu, 11 Mar 2004 22:42:47 +0000
parents f98f5b3f382d
children f90f66dc4999
comparison
equal deleted inserted replaced
54361:63ef4a00326a 54362:64ae6f2c8fee
48 #include "msdos.h" 48 #include "msdos.h"
49 #endif 49 #endif
50 50
51 #ifdef HAVE_X_WINDOWS 51 #ifdef HAVE_X_WINDOWS
52 typedef struct x_display_info Display_Info; 52 typedef struct x_display_info Display_Info;
53 typedef XImage * XImagePtr;
54 typedef XImagePtr XImagePtr_or_DC;
53 #define NativeRectangle XRectangle 55 #define NativeRectangle XRectangle
54 #endif 56 #endif
55 57
56 #ifdef HAVE_NTGUI 58 #ifdef HAVE_NTGUI
57 #include "w32gui.h" 59 #include "w32gui.h"
58 typedef struct w32_display_info Display_Info; 60 typedef struct w32_display_info Display_Info;
61 typedef XImage *XImagePtr;
62 typedef HDC XImagePtr_or_DC;
59 #endif 63 #endif
60 64
61 #ifdef HAVE_CARBON 65 #ifdef HAVE_CARBON
62 #include "macgui.h" 66 #include "macgui.h"
63 typedef struct mac_display_info Display_Info; 67 typedef struct mac_display_info Display_Info;
68 /* Mac equivalent of XImage. */
69 typedef Pixmap XImagePtr;
70 typedef XImagePtr XImagePtr_or_DC;
64 #endif 71 #endif
65 72
66 #ifndef NativeRectangle 73 #ifndef NativeRectangle
67 #define NativeRectangle int 74 #define NativeRectangle int
68 #endif 75 #endif
2621 int valid_image_p P_ ((Lisp_Object)); 2628 int valid_image_p P_ ((Lisp_Object));
2622 void prepare_image_for_display P_ ((struct frame *, struct image *)); 2629 void prepare_image_for_display P_ ((struct frame *, struct image *));
2623 int lookup_image P_ ((struct frame *, Lisp_Object)); 2630 int lookup_image P_ ((struct frame *, Lisp_Object));
2624 2631
2625 unsigned long image_background P_ ((struct image *, struct frame *, 2632 unsigned long image_background P_ ((struct image *, struct frame *,
2626 XImage *ximg)); 2633 XImagePtr_or_DC ximg));
2627 int image_background_transparent P_ ((struct image *, struct frame *, 2634 int image_background_transparent P_ ((struct image *, struct frame *,
2628 XImage *mask)); 2635 XImagePtr_or_DC mask));
2629 2636
2630 #endif 2637 #endif
2631 2638
2632 /* Defined in sysdep.c */ 2639 /* Defined in sysdep.c */
2633 2640