From ae8279db7859bc90a2ecca073b50918dac52d159 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Tue, 9 Jan 2007 08:53:34 +0000 Subject: [PATCH] (XDrawLine) [MAC_OS]: Remove macro. (XCreateGC_pixmap) [!HAVE_NTGUI]: Likewise. (x_disable_image) [!HAVE_NTGUI]: Use XCreateGC instead of XCreateGC_pixmap. --- src/image.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/image.c b/src/image.c index f4616b626a6..e67096b48b3 100644 --- a/src/image.c +++ b/src/image.c @@ -122,8 +122,6 @@ typedef struct mac_bitmap_record Bitmap_Record; #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 @@ x_disable_image (f, img) 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 @@ x_disable_image (f, img) 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); -- 2.39.2