From 81fa7338d94c665148cd3ab3ef82c37edab881b8 Mon Sep 17 00:00:00 2001 From: lecoanet Date: Fri, 22 Dec 2006 14:57:50 +0000 Subject: Renamed local X11 emulation functions to avoid name clashes with Tk --- generic/Types.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'generic') diff --git a/generic/Types.h b/generic/Types.h index f08ca15..6d42dfc 100644 --- a/generic/Types.h +++ b/generic/Types.h @@ -139,26 +139,34 @@ Tk_GetScrollInfo(interp, argc, (Tcl_Obj **) args, fract, count) # pragma warning(disable : 4273) # endif #undef XFillRectangle +#define XFillRectangle ZnXFillRectangle void XFillRectangle(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); # undef XFillRectangles +#define XFillRectangles ZnXFillRectangles void XFillRectangles(Display *display, Drawable d, GC gc, XRectangle* rectangles, int nrectangles); # undef XFillArc +#define XFillArc ZnXFillArc void XFillArc(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height, int start, int extent); # undef XFillPolygon +#define XFillPolygon ZnXFillPolygon void XFillPolygon(Display *display, Drawable d, GC gc, XPoint *points, int npoints, int shape, int mode); # undef XDrawRectangle +#define XDrawRectangle ZnXDrawRectangle void XDrawRectangle(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); # undef XDrawArc +#define XDrawArc ZnXDrawArc void XDrawArc(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height, int start, int extent); # undef XDrawLine +#define XDrawLine ZnXDrawLine void XDrawLine(Display *display, Drawable d, GC gc, int x1, int y1, int x2, int y2); # undef XDrawLines +#define XDrawLines ZnXDrawLines void XDrawLines(Display *display, Drawable d, GC gc, XPoint* points, int npoints, int mode); -- cgit v1.1