Mercurial > emacs
diff src/image.c @ 75153:fd0c738b5d49
(XDrawLine) [MAC_OS]: Remove macro.
(XCreateGC_pixmap) [!HAVE_NTGUI]: Likewise.
(x_disable_image) [!HAVE_NTGUI]: Use XCreateGC instead of
XCreateGC_pixmap.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Tue, 09 Jan 2007 08:53:34 +0000 |
| parents | a87d92458ce0 |
| children | 3d45362f1d38 32073cbc5eb6 |
line wrap: on
line diff
--- a/src/image.c Tue Jan 09 08:53:26 2007 +0000 +++ b/src/image.c Tue Jan 09 08:53:34 2007 +0000 @@ -122,8 +122,6 @@ #define FRAME_X_VISUAL(f) FRAME_X_DISPLAY_INFO (f)->visual #define x_defined_color mac_defined_color #define DefaultDepthOfScreen(screen) (one_mac_display_info.n_planes) -#define XDrawLine(display, w, gc, x1, y1, x2, y2) \ - mac_draw_line_to_pixmap(display, w, gc, x1, y1, x2, y2) #endif /* MAC_OS */ @@ -5251,14 +5249,12 @@ GC gc; #ifdef MAC_OS -#define XCreateGC_pixmap(dpy, pixmap) XCreateGC (dpy, NULL, 0, NULL) #define MaskForeground(f) PIX_MASK_DRAW #else -#define XCreateGC_pixmap(dpy, pixmap) XCreateGC (dpy, pixmap, 0, NULL) #define MaskForeground(f) WHITE_PIX_DEFAULT (f) #endif - gc = XCreateGC_pixmap (dpy, img->pixmap); + gc = XCreateGC (dpy, img->pixmap, 0, NULL); XSetForeground (dpy, gc, BLACK_PIX_DEFAULT (f)); XDrawLine (dpy, img->pixmap, gc, 0, 0, img->width - 1, img->height - 1); @@ -5268,7 +5264,7 @@ if (img->mask) { - gc = XCreateGC_pixmap (dpy, img->mask); + gc = XCreateGC (dpy, img->mask, 0, NULL); XSetForeground (dpy, gc, MaskForeground (f)); XDrawLine (dpy, img->mask, gc, 0, 0, img->width - 1, img->height - 1);