Update from the Windows port and general cleanup/restructure

1 files changed, 16 insertions, 21 deletions

diff --git a/generic/tkZinc.h b/generic/tkZinc.h
index 1d696dc..d2d7ba1 100644
--- a/generic/tkZinc.h
+++ b/generic/tkZinc.h
@@ -35,17 +35,17 @@
 #include "List.h"
 #include "MapInfo.h"
 
-typedef struct _TagSearch {
-  WidgetInfo	*wi;
-  Item		current;	/* Pointer to last item returned. */
-  Item		previous;	/* The item right before the current
+typedef struct _ZnTagSearch {
+  ZnWInfo	*wi;
+  ZnItem	current;	/* Pointer to last item returned. */
+  ZnItem	previous;	/* The item right before the current
 				 * is tracked so if the current is
 				 * deleted we don't have to start from the
 				 * beginning. */
   ZnBool	over;		/* Non-zero means NextItem should always
 				 * return NULL. */
   int		type;		/* search type */
-  int		id;		/* item id for searches by id */
+  long		id;		/* item id for searches by id */
 
   Tk_Uid	tag;		/* tag expression string */
   int		tag_index;	/* current position in string scan */
@@ -54,26 +54,21 @@ typedef struct _TagSearch {
   char		*rewrite_buf;	/* tag string (after removing escapes) */
   unsigned int	rewrite_buf_alloc;	/* available space for rewrites */
 
-  struct _TagSearchExpr	*expr;	/* compiled tag expression */
-  Item		group;
+  struct _TagSearchExpr *expr;	/* compiled tag expression */
+  ZnItem	group;
   ZnBool	recursive;
   ZnList	item_stack;
-} TagSearch;
+} ZnTagSearch;
 
-#define NewLongObj	Tcl_NewLongObj
-#define NewBooleanObj	Tcl_NewBooleanObj
-#define NewDoubleObj	Tcl_NewDoubleObj
 
-Tcl_Obj *NewStringObj(CONST char *val);
-void SetStringObj(Tcl_Obj *o, char *val);
-int ZnParseCoordList(WidgetInfo *wi, Tcl_Obj *arg, ZnPoint **pts,
-		     char **controls, int *num_pts, ZnBool *old_format);
-int ZnItemWithTagOrId(WidgetInfo *wi, Tcl_Obj *tag_or_id,
-		      Item *item, TagSearch **search_var);
-void ZnTagSearchDestroy(TagSearch *search);
-void ZnDoItem(Tcl_Interp *interp, Item item, int part, Tk_Uid tag_uid);
-void ZnNeedRedisplay(WidgetInfo *wi);
-void ZnDamage(WidgetInfo *wi, ZnBBox *damage);
+int ZnParseCoordList(ZnWInfo *wi, Tcl_Obj *arg, ZnPoint **pts,
+		     char **controls, unsigned int *num_pts, ZnBool *old_format);
+int ZnItemWithTagOrId(ZnWInfo *wi, Tcl_Obj *tag_or_id,
+		      ZnItem *item, ZnTagSearch **search_var);
+void ZnTagSearchDestroy(ZnTagSearch *search);
+void ZnDoItem(Tcl_Interp *interp, ZnItem item, int part, Tk_Uid tag_uid);
+void ZnNeedRedisplay(ZnWInfo *wi);
+void ZnDamage(ZnWInfo *wi, ZnBBox *damage);
 
 
 #endif /* _tkZinc_h */