1 files changed, 14 insertions, 11 deletions

diff --git a/generic/Item.h b/generic/Item.h
index 0db8b35..966e88b 100644
--- a/generic/Item.h
+++ b/generic/Item.h
@@ -142,10 +142,10 @@ typedef struct _FieldSetStruct {
 /*
  * Item class record --
  */
-typedef int (*ItemInitMethod)(Item item, int *argc, Arg **args);
-typedef int (*ItemConfigureMethod)(Item item, int argc, ZnAttrList args,
+typedef int (*ItemInitMethod)(Item item, int *argc, Tcl_Obj *CONST *args[]);
+typedef int (*ItemConfigureMethod)(Item item, int argc, Tcl_Obj *CONST args[],
 				   int *flags);
-typedef int (*ItemQueryMethod)(Item item, int argc, ZnAttrList args);
+typedef int (*ItemQueryMethod)(Item item, int argc, Tcl_Obj *CONST args[]);
 typedef void (*ItemCloneMethod)(Item item);
 typedef void (*ItemDestroyMethod)(Item item);
 typedef void (*ItemDrawMethod)(Item item);
@@ -167,8 +167,9 @@ typedef int (*ItemCoordsMethod)(Item item, int contour, int index, int cmd,
 typedef void (*ItemInsertCharsMethod)(Item item, int index, char *chars);
 typedef void (*ItemDeleteCharsMethod)(Item item, int first, int last);
 typedef void (*ItemCursorMethod)(Item item, int index);
-typedef int (*ItemIndexMethod)(Item item, char *index_str, int *index);
-typedef int (*ItemSelectionMethod)(Item item, int offset, char *chars, int max_chars);
+typedef int (*ItemIndexMethod)(Item item, Tcl_Obj *index_spec, int *index);
+typedef int (*ItemSelectionMethod)(Item item, int offset, char *chars,
+				   int max_chars);
 typedef void (*ItemPostScriptMethod)(Item item, PostScriptInfo ps_info);
 
 typedef struct _ItemClassStruct {
@@ -214,9 +215,10 @@ typedef struct _ItemClassStruct {
 extern struct _ITEM {
   Item (*CloneItem)(Item model);
   void (*DestroyItem)(Item item);
-  int (*ConfigureItem)(Item item, int field, int argc, ZnAttrList args, ZnBool init);
-  int (*QueryItem)(Item item, int field, int argc, ZnAttrList args);
-  int (*AttributesInfo)(Item item, int field, int argc, Arg *args);
+  int (*ConfigureItem)(Item item, int field, int argc, Tcl_Obj *CONST args[],
+		       ZnBool init);
+  int (*QueryItem)(Item item, int field, int argc, Tcl_Obj *CONST args[]);
+  int (*AttributesInfo)(Item item, int field, int argc, Tcl_Obj *CONST args[]);
   void (*SetFieldsAutoAlign)(Item item, int alignment);
   void (*InsertItem)(Item item, Item group, Item mark_item, ZnBool before);
   void (*UpdateItemPriority)(Item item, Item mark_item, ZnBool before);
@@ -249,15 +251,16 @@ extern struct _ITEM {
 extern struct _ITEM_P {
   void (*GlobalModuleInit)();
   Item (*CreateItem)(struct _WidgetInfo *wi, ItemClass item_class,
-		     int *argc, Arg **args);
+		     int *argc, Tcl_Obj *CONST *args[]);
   void (*AddItemClass)(ItemClass class);
   ItemClass (*LookupItemClass)(char *class_name);
   ZnList (*ItemClassList)();
   void (*Damage)(struct _WidgetInfo *wi, ZnBBox *damage);
   void (*Repair)(struct _WidgetInfo *wi);
   void (*Update)(struct _WidgetInfo *wi);
-  int (*ConfigureAttributes)(char *record, int field, int argc, Arg *args, int *flags);
-  int (*QueryAttribute)(char *record, int field, Arg attr_name);
+  int (*ConfigureAttributes)(char *record, int field, int argc,
+			     Tcl_Obj *CONST args[], int *flags);
+  int (*QueryAttribute)(char *record, int field, Tcl_Obj *attr_name);
   void (*InitFields)(FieldSet field_set);
   void (*CloneFields)(FieldSet field_set);
   void (*FreeFields)(FieldSet field_set);