From f3f42dd59ad0c3283effef189e2b105607fb1efd Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Thu, 2 Oct 2003 12:26:56 +0000
Subject: Added a macro for ZnPointInRegion

---
 generic/Types.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/generic/Types.h b/generic/Types.h
index 5468fb7..65dd82e 100644
--- a/generic/Types.h
+++ b/generic/Types.h
@@ -61,6 +61,7 @@
 #  include <tkImgPhoto.h>
 #  include <tkVMacro.h>
 #else
+#  include <tkDecls.h>
 #  include <tkIntDecls.h>
 #endif
 #include <stdio.h>
@@ -115,12 +116,12 @@ typedef void	*ZnPtr;
 /*
  * Macros for Tk8.4/perl/Tk utf compatibility
  */
-#define Tcl_NumUtfChars(str, len) ((len)<0?strlen(str):(len))
+#define Tcl_NumUtfChars(str, len) (((len)<0)?((int)strlen(str)):(len))
 #define Tcl_UtfAtIndex(str, index) (&(str)[(index)])
 #define Tcl_GetString(str) (Tcl_GetStringFromObj(str, NULL))
 
 #define Tk_GetScrollInfoObj(interp, argc, args, fract, count) \
-  Tk_GetScrollInfo(interp, argc, (Tcl_Obj **) args, fract, count)
+Tk_GetScrollInfo(interp, argc, (Tcl_Obj **) args, fract, count)
 #endif
 
 /*
@@ -162,6 +163,7 @@ EXTERN void XDrawLine(Display* display, Drawable d, GC gc,
 EXTERN void XDrawLines(Display* display, Drawable d, GC gc,
 		       XPoint* points, int npoints, int mode);
 
+EXTERN void ZnPointInRegion(TkRegion reg, int x, int y);
 EXTERN void ZnUnionRegion(TkRegion sra, TkRegion srb, 
 			  TkRegion dr_return);
 EXTERN void ZnOffsetRegion(TkRegion reg, int dx, int dy);
@@ -185,6 +187,8 @@ EXTERN TkRegion ZnPolygonRegion(XPoint *points, int n,
 #    define ZN_GL_POINT_SIZE_RANGE GL_POINT_SIZE_RANGE
 #  endif
 #else /* !_WIN32 */
+#  define ZnPointInRegion(reg, x, y) \
+  XPointInRegion((Region) reg, x, y)
 #  define ZnPolygonRegion(points, npoints, fillrule) \
   ((TkRegion) XPolygonRegion(points, npoints, fillrule))
 #  define ZnUnionRegion(sra, srb, rreturn) \
-- 
cgit v1.1