Ajout du bit COMPOSE_ALPHA_BIT

Ajout des structures ZnToAreaStruct et ZnPickStruct pour
simplifier l'interface des m�thodes ToArea et Pick et accomoder
les nouvelles fonctionalit�s des commandes de find/addtag.
Modification des prototypes de ToArea et Pick.
Suppression de la variable de classe has_fields.

1 files changed, 22 insertions, 6 deletions

diff --git a/generic/Item.h b/generic/Item.h
index 840fa2c..21dc2c2 100644
--- a/generic/Item.h
+++ b/generic/Item.h
@@ -81,6 +81,7 @@
 #define UPDATE_DEPENDENT_BIT	       16
 #define COMPOSE_SCALE_BIT	       32
 #define COMPOSE_ROTATION_BIT	       64
+#define COMPOSE_ALPHA_BIT	      128
 
 
 struct _WidgetInfo;
@@ -109,6 +110,25 @@ typedef struct _ItemStruct {
   struct _ItemStruct	*connected_item;	/* Item this item is connected to 	*/
 } ItemStruct, *Item;
 
+typedef struct _ToAreaStruct {
+  Tk_Uid	tag_uid;
+  ZnBool	enclosed;
+  Item		in_group;
+  ZnBool	report;
+  ZnBool	recursive;
+  ZnBBox	*area;
+} ZnToAreaStruct, *ZnToArea;
+
+typedef struct _PickStruct {
+  int		aperture;
+  Item		in_group;
+  Item		start_item;
+  ZnBool	recursive;
+  ZnPoint	*point;
+  Item		a_item;
+  int		a_part;
+} ZnPickStruct, *ZnPick;
+
 
 /*
  * Item class record --
@@ -122,12 +142,9 @@ typedef void (*ItemDestroyMethod)(Item item);
 typedef void (*ItemDrawMethod)(Item item);
 typedef void (*ItemRenderMethod)(Item item);
 typedef void (*ItemComputeCoordinatesMethod)(Item item, ZnBool force);
-typedef int (*ItemToAreaMethod)(Item item, ZnBBox *area,
-				Tk_Uid tag_uid, int enclosed, ZnBool report);
+typedef int (*ItemToAreaMethod)(Item item, ZnToArea ta);
+typedef double (*ItemPickMethod)(Item item, ZnPick ps);
 typedef ZnBool (*ItemIsSensitiveMethod)(Item item, int part);
-typedef double (*ItemPickMethod)(Item item, ZnPoint *point,
-				 Item start_item, int aperture,
-				 Item *a_item, int *a_part);
 typedef struct _FieldSetStruct* (*ItemGetFieldSetMethod)(Item item);
 typedef void (*ItemContourMethod)(Item item, int cmd, ZnPoly *poly);
 typedef void (*ItemPickVertexMethod)(Item item, ZnPoint *p, int *contour,
@@ -151,7 +168,6 @@ typedef void (*ItemPostScriptMethod)(Item item, PostScriptInfo ps_info);
 
 typedef struct _ItemClassStruct {
   int				size;
-  ZnBool			has_fields;	/* 1 if fields are supported */
   int				num_parts;	/* 0 if no special parts, else
 						 * gives how many parts exist. */
   ZnBool			has_anchors;	/* 1 if anchors are supported */