aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Bezier.c4
-rw-r--r--generic/Arc.c4
-rw-r--r--generic/Curve.c4
-rw-r--r--generic/Icon.c8
-rw-r--r--generic/Map.c4
-rw-r--r--generic/Rectangle.c4
-rw-r--r--generic/Reticle.c5
-rw-r--r--generic/Triangles.c4
-rw-r--r--generic/Window.c4
9 files changed, 21 insertions, 20 deletions
diff --git a/Bezier.c b/Bezier.c
index 3ac35f5..b5b505f 100644
--- a/Bezier.c
+++ b/Bezier.c
@@ -397,7 +397,7 @@ Configure(Item item,
XColor *color;
int alpha;
- status = ITEM_P.ConfigureAttributes((char *) item, -1, argc, argv, flags);
+ status = ZnConfigureAttributes(wi, item, bz_attrs, argc, argv, flags);
if (bz->gradient &&
(ISSET(*flags, ZN_BORDER_FLAG) || (bz->relief == RELIEF_FLAT))) {
@@ -435,7 +435,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, bz_attrs, argv[0]) == ZN_ERROR) {
return ZN_ERROR;
}
diff --git a/generic/Arc.c b/generic/Arc.c
index 9fdbc34..5911b29 100644
--- a/generic/Arc.c
+++ b/generic/Arc.c
@@ -362,7 +362,7 @@ Configure(Item item,
ArcItem arc = (ArcItem) item;
int status = ZN_OK;
- status = ITEM_P.ConfigureAttributes((char *) item, -1, argc, argv, flags);
+ status = ZnConfigureAttributes(item->wi, item, arc_attrs, argc, argv, flags);
if (ISSET(*flags, ZN_TILE_FLAG)) {
if (ValidateImage(item->wi, item, arc->tile_name, ArcTileChange,
@@ -389,7 +389,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, arc_attrs, argv[0]) == ZN_ERROR) {
return ZN_ERROR;
}
diff --git a/generic/Curve.c b/generic/Curve.c
index 79d7cf8..46f55dc 100644
--- a/generic/Curve.c
+++ b/generic/Curve.c
@@ -471,7 +471,7 @@ Configure(Item item,
XColor *color;
int alpha;
- status = ITEM_P.ConfigureAttributes((char *) item, -1, argc, argv, flags);
+ status = ZnConfigureAttributes(wi, item, cv_attrs, argc, argv, flags);
if (cv->gradient &&
(ISSET(*flags, ZN_BORDER_FLAG) || (cv->relief == RELIEF_FLAT))) {
@@ -509,7 +509,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, cv_attrs, argv[0]) == ZN_ERROR) {
return ZN_ERROR;
}
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;
diff --git a/generic/Map.c b/generic/Map.c
index 6887d37..a05b13d 100644
--- a/generic/Map.c
+++ b/generic/Map.c
@@ -371,7 +371,7 @@ Configure(Item item,
WidgetInfo *wi = item->wi;
MapItem map = (MapItem) item;
- if (ITEM_P.ConfigureAttributes((char *) item, -1, argc, argv, flags) == ZN_ERROR) {
+ if (ZnConfigureAttributes(wi, item, map_attrs, argc, argv, flags) == ZN_ERROR) {
return ZN_ERROR;
}
@@ -416,7 +416,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, map_attrs, argv[0]) == ZN_ERROR) {
return ZN_ERROR;
}
diff --git a/generic/Rectangle.c b/generic/Rectangle.c
index e77f620..d17b62c 100644
--- a/generic/Rectangle.c
+++ b/generic/Rectangle.c
@@ -302,7 +302,7 @@ Configure(Item item,
XColor *color;
int alpha;
- status = ITEM_P.ConfigureAttributes((char *) item, -1, argc, argv, flags);
+ status = ZnConfigureAttributes(wi, item, rect_attrs, argc, argv, flags);
if (rect->gradient &&
(ISSET(*flags, ZN_BORDER_FLAG) || (rect->relief == RELIEF_FLAT))) {
@@ -340,7 +340,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, rect_attrs, argv[0]) == ZN_ERROR) {
return ZN_ERROR;
}
diff --git a/generic/Reticle.c b/generic/Reticle.c
index 6d67d9f..a256588 100644
--- a/generic/Reticle.c
+++ b/generic/Reticle.c
@@ -201,7 +201,8 @@ Configure(Item item,
Tcl_Obj *CONST argv[],
int *flags)
{
- if (ITEM_P.ConfigureAttributes((char *)item, -1, argc, argv, flags) == ZN_ERROR) {
+ if (ZnConfigureAttributes(item->wi, item, reticle_attrs,
+ argc, argv, flags) == ZN_ERROR) {
return ZN_ERROR;
}
@@ -221,7 +222,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, reticle_attrs, argv[0]) == ZN_ERROR) {
return ZN_ERROR;
}
diff --git a/generic/Triangles.c b/generic/Triangles.c
index 92827d7..70287f3 100644
--- a/generic/Triangles.c
+++ b/generic/Triangles.c
@@ -240,7 +240,7 @@ Configure(Item item,
{
int status = ZN_OK;
- status = ITEM_P.ConfigureAttributes((char *) item, -1, argc, argv, flags);
+ status = ZnConfigureAttributes(item->wi, item, tr_attrs, argc, argv, flags);
return status;
}
@@ -258,7 +258,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, tr_attrs, argv[0]) == ZN_ERROR) {
return ZN_ERROR;
}
diff --git a/generic/Window.c b/generic/Window.c
index 978e9e6..a380026 100644
--- a/generic/Window.c
+++ b/generic/Window.c
@@ -265,7 +265,7 @@ Configure(Item item,
old_connected = item->connected_item;
old_win = wind->win;
- if (ITEM_P.ConfigureAttributes((char *) item, -1, argc, argv, flags) == ZN_ERROR) {
+ if (ZnConfigureAttributes(wi, item, wind_attrs, argc, argv, flags) == ZN_ERROR) {
return ZN_ERROR;
}
@@ -321,7 +321,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, wind_attrs, argv[0]) == ZN_ERROR) {
return ZN_ERROR;
}
generated by cgit v1.1 at 2024-07-03 11:22:14 +0000