Simplification du protocole de DrawFields, RenderFields,

FieldInsertChars, FieldDeleteChars suite au changement de
variable dans FieldSet.

1 files changed, 7 insertions, 9 deletions

diff --git a/generic/Field.h b/generic/Field.h
index 7aaae54..0da60e7 100644
--- a/generic/Field.h
+++ b/generic/Field.h
@@ -38,7 +38,6 @@
 
 
 struct _ItemStruct;
-struct _WidgetInfo;
 
 
 /*
@@ -50,7 +49,7 @@ struct _WidgetInfo;
  *
  */
 typedef struct _FieldSetStruct {
-  struct _WidgetInfo	*wi;
+  struct _ItemStruct	*item;
   ZnLabelFormat		label_format;
   unsigned int		num_fields;
   struct _FieldStruct	*fields;
@@ -72,16 +71,15 @@ extern struct _FIELD {
 			int argc, Tcl_Obj *CONST argv[], int *flags);
   int (*QueryField)(FieldSet fs, unsigned int field,
 		    int argc, Tcl_Obj *CONST argv[]);
-  void (*DrawFields)(FieldSet fs, struct _ItemStruct *item);
-  void (*RenderFields)(FieldSet fs, struct _ItemStruct *item);
+  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,
-		    struct _ItemStruct *item, Tcl_Obj *index_spec, int *index);
-  void (*FieldInsertChars)(FieldSet fs, int field, int *index, char *chars);
-  void (*FieldDeleteChars)(FieldSet fs, int field,
-			   int *first, int *last);
+  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,
+			     int *first, int *last);
   void (*FieldCursor)(FieldSet fs, int field, int index);
   int (*FieldSelection)(FieldSet fs, int field, int offset,
 			char *chars, int max_chars);