aboutsummaryrefslogtreecommitdiffstats
path: root/src/image.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/image.c')
-rw-r--r--src/image.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/image.c b/src/image.c
index 8f13da337ff..b4ee3104543 100644
--- a/src/image.c
+++ b/src/image.c
@@ -122,8 +122,6 @@ typedef struct mac_bitmap_record Bitmap_Record;
122#define FRAME_X_VISUAL(f) FRAME_X_DISPLAY_INFO (f)->visual 122#define FRAME_X_VISUAL(f) FRAME_X_DISPLAY_INFO (f)->visual
123#define x_defined_color mac_defined_color 123#define x_defined_color mac_defined_color
124#define DefaultDepthOfScreen(screen) (one_mac_display_info.n_planes) 124#define DefaultDepthOfScreen(screen) (one_mac_display_info.n_planes)
125#define XDrawLine(display, w, gc, x1, y1, x2, y2) \
126 mac_draw_line_to_pixmap(display, w, gc, x1, y1, x2, y2)
127 125
128#endif /* MAC_OS */ 126#endif /* MAC_OS */
129 127
@@ -5253,14 +5251,12 @@ x_disable_image (f, img)
5253 GC gc; 5251 GC gc;
5254 5252
5255#ifdef MAC_OS 5253#ifdef MAC_OS
5256#define XCreateGC_pixmap(dpy, pixmap) XCreateGC (dpy, NULL, 0, NULL)
5257#define MaskForeground(f) PIX_MASK_DRAW 5254#define MaskForeground(f) PIX_MASK_DRAW
5258#else 5255#else
5259#define XCreateGC_pixmap(dpy, pixmap) XCreateGC (dpy, pixmap, 0, NULL)
5260#define MaskForeground(f) WHITE_PIX_DEFAULT (f) 5256#define MaskForeground(f) WHITE_PIX_DEFAULT (f)
5261#endif 5257#endif
5262 5258
5263 gc = XCreateGC_pixmap (dpy, img->pixmap); 5259 gc = XCreateGC (dpy, img->pixmap, 0, NULL);
5264 XSetForeground (dpy, gc, BLACK_PIX_DEFAULT (f)); 5260 XSetForeground (dpy, gc, BLACK_PIX_DEFAULT (f));
5265 XDrawLine (dpy, img->pixmap, gc, 0, 0, 5261 XDrawLine (dpy, img->pixmap, gc, 0, 0,
5266 img->width - 1, img->height - 1); 5262 img->width - 1, img->height - 1);
@@ -5270,7 +5266,7 @@ x_disable_image (f, img)
5270 5266
5271 if (img->mask) 5267 if (img->mask)
5272 { 5268 {
5273 gc = XCreateGC_pixmap (dpy, img->mask); 5269 gc = XCreateGC (dpy, img->mask, 0, NULL);
5274 XSetForeground (dpy, gc, MaskForeground (f)); 5270 XSetForeground (dpy, gc, MaskForeground (f));
5275 XDrawLine (dpy, img->mask, gc, 0, 0, 5271 XDrawLine (dpy, img->mask, gc, 0, 0,
5276 img->width - 1, img->height - 1); 5272 img->width - 1, img->height - 1);