Update from the Windows port and general cleanup/restructure

1 files changed, 30 insertions, 30 deletions

diff --git a/generic/Field.h b/generic/Field.h
index 3b4e648..9d80e73 100644
--- a/generic/Field.h
+++ b/generic/Field.h
@@ -37,7 +37,8 @@
 #include "Image.h"
 
 
-struct _ItemStruct;
+struct _ZnItemStruct;
+struct _ZnAttrConfig;
 
 
 /*
@@ -48,8 +49,8 @@ struct _ItemStruct;
  * should use the methods in FIELD.
  *
  */
-typedef struct _FieldSetStruct {
-  struct _ItemStruct	*item;
+typedef struct _ZnFieldSetStruct {
+  struct _ZnItemStruct	*item;
   ZnLabelFormat		label_format;
   unsigned int		num_fields;
   struct _FieldStruct	*fields;
@@ -57,39 +58,38 @@ typedef struct _FieldSetStruct {
   ZnDim			label_height;	/* 2 only with GetLabelBBox. -1 means
 					 * not up to date. */
   ZnPoint		label_pos;	/* Describe the label origin. */
-} FieldSetStruct, *FieldSet;
+} ZnFieldSetStruct, *ZnFieldSet;
 
 
+extern struct _ZnFIELD {
+  struct _ZnAttrConfig	*attr_desc;
 
-extern struct _FIELD {
-  ZnAttrConfig	*attr_desc;
-
-  void (*InitFields)(FieldSet fs);
-  void (*CloneFields)(FieldSet fs);
-  void (*FreeFields)(FieldSet fs);
-  int (*ConfigureField)(FieldSet fs, int field, int argc, Tcl_Obj *CONST argv[], int *flags);
-  int (*QueryField)(FieldSet fs, int field, int argc, Tcl_Obj *CONST argv[]);
-  void (*DrawFields)(FieldSet fs);
-  void (*RenderFields)(FieldSet fs);
-  int (*FieldsToArea)(FieldSet fs, ZnBBox *area);
-  ZnBool (*IsFieldSensitive)(FieldSet fs, int part);
-  double (*FieldsPick)(FieldSet fs, ZnPoint *p, int *part);
-  int (*FieldIndex)(FieldSet fs, int field, Tcl_Obj *index_spec, int *index);
-  ZnBool (*FieldInsertChars)(FieldSet fs, int field, int *index, char *chars);
-  ZnBool (*FieldDeleteChars)(FieldSet fs, int field,
+  void (*InitFields)(ZnFieldSet fs);
+  void (*CloneFields)(ZnFieldSet fs);
+  void (*FreeFields)(ZnFieldSet fs);
+  int (*ConfigureField)(ZnFieldSet fs, int field, int argc, Tcl_Obj *CONST argv[], int *flags);
+  int (*QueryField)(ZnFieldSet fs, int field, int argc, Tcl_Obj *CONST argv[]);
+  void (*DrawFields)(ZnFieldSet fs);
+  void (*RenderFields)(ZnFieldSet fs);
+  int (*FieldsToArea)(ZnFieldSet fs, ZnBBox *area);
+  ZnBool (*IsFieldSensitive)(ZnFieldSet fs, int part);
+  double (*FieldsPick)(ZnFieldSet fs, ZnPoint *p, int *part);
+  int (*FieldIndex)(ZnFieldSet fs, int field, Tcl_Obj *index_spec, int *index);
+  ZnBool (*FieldInsertChars)(ZnFieldSet fs, int field, int *index, char *chars);
+  ZnBool (*FieldDeleteChars)(ZnFieldSet fs, int field,
 			     int *first, int *last);
-  void (*FieldCursor)(FieldSet fs, int field, int index);
-  int (*FieldSelection)(FieldSet fs, int field, int offset,
+  void (*FieldCursor)(ZnFieldSet fs, int field, int index);
+  int (*FieldSelection)(ZnFieldSet fs, int field, int offset,
 			char *chars, int max_chars);
-  void (*LeaderToLabel)(FieldSet fs, ZnPoint *start, ZnPoint *end);
-  void (*GetLabelBBox)(FieldSet fs, ZnDim *w, ZnDim *h);
-  void (*GetFieldBBox)(FieldSet fs, unsigned int index,
+  void (*LeaderToLabel)(ZnFieldSet fs, ZnPoint *start, ZnPoint *end);
+  void (*GetLabelBBox)(ZnFieldSet fs, ZnDim *w, ZnDim *h);
+  void (*GetFieldBBox)(ZnFieldSet fs, unsigned int index,
 		       ZnBBox *field_bbox);
-  void (*SetFieldsAutoAlign)(FieldSet fs, int alignment);
-  void (*ClearFieldCache)(FieldSet fs, int field);
-  char *(*GetFieldStruct)(FieldSet fs, int field);
-  int (*NumFields)(FieldSet fs);
-} FIELD;
+  void (*SetFieldsAutoAlign)(ZnFieldSet fs, int alignment);
+  void (*ClearFieldCache)(ZnFieldSet fs, int field);
+  char *(*GetFieldStruct)(ZnFieldSet fs, int field);
+  unsigned int (*NumFields)(ZnFieldSet fs);
+} ZnFIELD;
 
 
 #endif /* _Field_h */