Ajustements suite a la restructuration de Item.c et � la creation de Field.c

1 files changed, 4 insertions, 4 deletions

diff --git a/generic/Icon.c b/generic/Icon.c
index 1672c2f..d3812ed 100644
--- a/generic/Icon.c
+++ b/generic/Icon.c
@@ -235,7 +235,7 @@ Configure(Item		item,
   Item		old_connected;
 
   old_connected = item->connected_item;
-  if (ITEM_P.ConfigureAttributes((char *) item, -1, argc, argv, flags) == ZN_ERROR) {
+  if (ZnConfigureAttributes(wi, item, icon_attrs, argc, argv, flags) == ZN_ERROR) {
     return ZN_ERROR;
   }  
 
@@ -277,7 +277,7 @@ Query(Item		item,
       int		argc,
       Tcl_Obj *CONST	argv[])
 {
-  if (ITEM_P.QueryAttribute((char *) item, -1, argv[0]) == ZN_ERROR) {
+  if (ZnQueryAttribute(item->wi, item, icon_attrs, argv[0]) == ZN_ERROR) {
     return ZN_ERROR;
   }  
 
@@ -432,7 +432,7 @@ Draw(Item	item)
     box = inter;
     im_bits = GetImageBits(wi->win, icon->image_name, icon->image);
     pmap = GetImagePixmap(wi->win, icon->image_name, icon->image, &mask_pmap);
-    ITEM_P.CurrentClip(wi, &clip_region, NULL, &simple);
+    ZnCurrentClip(wi, &clip_region, NULL, &simple);
     if ((im_bits->mask == ZnUnspecifiedPattern) || simple) {
       if (im_bits->mask != ZnUnspecifiedPattern) {
 	XSetClipMask(wi->dpy, wi->gc, mask_pmap);
@@ -489,7 +489,7 @@ Draw(Item	item)
     box.orig = icon->pos_dev;
     box.corner.x = icon->pos_dev.x + w;
     box.corner.y = icon->pos_dev.y + h;
-    ITEM_P.CurrentClip(wi, NULL, &clip_box, &simple);
+    ZnCurrentClip(wi, NULL, &clip_box, &simple);
     if (simple) {
       IntersectBBox(&box, clip_box, &inter);
       box = inter;