priority is an unsigned short

id is an unsigned int

1 files changed, 10 insertions, 6 deletions

diff --git a/generic/Item.h b/generic/Item.h
index b72e02e..9cf6991 100644
--- a/generic/Item.h
+++ b/generic/Item.h
@@ -92,6 +92,8 @@ typedef struct _ZnAttrConfig {
 #define	ZN_CONFIG_WINDOW	30
 #define	ZN_CONFIG_ALPHA		31
 #define	ZN_CONFIG_FILL_RULE	32
+#define	ZN_CONFIG_SHORT		33
+#define	ZN_CONFIG_USHORT	34
 
 #define ZN_DRAW_FLAG	1 << 0
 #define	ZN_COORDS_FLAG	1 << 1
@@ -169,20 +171,20 @@ struct _ZnTransfo;
  */
 typedef struct _ZnItemStruct {
   /* Private data */
-  long			id;
+  unsigned int		id;
   ZnList		tags;
   struct _ZnWInfo	*wi;			/* The widget this item is on	*/
   struct _ZnItemClassStruct *class;		/* item class			*/
   struct _ZnItemStruct	*previous;		/* previous item in group list	*/
   struct _ZnItemStruct	*next;			/* next item in group list	*/
+  struct _ZnItemStruct	*parent;
   ZnBBox		item_bounding_box;	/* device item bounding box	*/
 
   /* Common attributes */
   unsigned short	flags;			
   unsigned short	part_sensitive;		/* Currently limited to 16 parts per item */
-  short			inv_flags;
-  struct _ZnItemStruct	*parent;
-  int			priority;
+  unsigned short	inv_flags;
+  unsigned short	priority;
   struct _ZnTransfo	*transfo;
   struct _ZnItemStruct	*connected_item;	/* Item this item is connected to 	*/
 #ifdef GL
@@ -198,6 +200,7 @@ typedef struct _ZnToAreaStruct {
   ZnItem	in_group;
   ZnBool	report;
   ZnBool	recursive;
+  ZnBool	override_atomic;
   ZnBBox	*area;
 } ZnToAreaStruct, *ZnToArea;
 
@@ -206,6 +209,7 @@ typedef struct _ZnPickStruct {
   ZnItem	in_group;
   ZnItem	start_item;
   ZnBool	recursive;
+  ZnBool	override_atomic;
   ZnPoint	*point;
   ZnItem 	a_item;
   int		a_part;
@@ -312,9 +316,9 @@ extern struct _ZnITEM {
   void (*ResetTransfo)(ZnItem item);
   void (*SetTransfo)(ZnItem item, struct _ZnTransfo *t);
   void (*TranslateItem)(ZnItem item, ZnReal tx, ZnReal ty);
-  void (*ScaleItem)(ZnItem item, ZnReal sx, ZnReal sy);
+  void (*ScaleItem)(ZnItem item, ZnReal sx, ZnReal sy, ZnPoint *p);
   void (*SkewItem)(ZnItem item, ZnReal x_skew, ZnReal y_skew);
-  void (*RotateItem)(ZnItem item, ZnReal angle, ZnPoint *p);
+  void (*RotateItem)(ZnItem item, ZnReal angle, ZnBool deg, ZnPoint *p);
   void (*Invalidate)(ZnItem item, int reason);
   void (*InvalidateItems)(ZnItem group, ZnItemClass item_class);
   void (*GetItemTransform)(ZnItem item, struct _ZnTransfo *t);