Modifications des m�thodes d'un item et d'autres ajustements.

1 files changed, 12 insertions, 6 deletions

diff --git a/generic/Item.h b/generic/Item.h
index 26a4db5..9a73670 100644
--- a/generic/Item.h
+++ b/generic/Item.h
@@ -42,7 +42,8 @@
 #define	DEFAULT_WAY_POINT_PRIORITY	4
 #define	DEFAULT_TABULAR_PRIORITY	3
 #define DEFAULT_RECTANGLE_PRIORITY	2
-#define DEFAULT_MULTI_POINT_PRIORITY	2
+#define DEFAULT_CURVE_PRIORITY		2
+#define DEFAULT_BEZIER_PRIORITY		2
 #define DEFAULT_ARC_PRIORITY		2
 #define	DEFAULT_RETICLE_PRIORITY	2
 #define	DEFAULT_MAP_PRIORITY		1
@@ -155,10 +156,12 @@ typedef double (*ItemPickMethod)(Item item, ZnPoint *point,
 				 Item start_item, int aperture,
 				 Item *a_item, int *a_part);
 typedef FieldSet (*ItemGetFieldSetMethod)(Item item);
+typedef void (*ItemContourMethod)(Item item, int cmd, ZnPoly *poly);
+typedef void (*ItemPickVertexMethod)(Item item, ZnPoint *p,
+				     int vertex, int o_vertex);
 typedef void (*ItemGetAnchorMethod)(Item item, ZnAnchor anchor, ZnPoint *p);
-typedef ZnBool (*ItemGetClipVerticesMethod)(Item item, ZnPoint **points,
-					    int *num_points);
-typedef int (*ItemCoordsMethod)(Item item, int index, int cmd,
+typedef ZnBool (*ItemGetClipVerticesMethod)(Item item, ZnPoly *points);
+typedef int (*ItemCoordsMethod)(Item item, int contour, int index, int cmd,
 				ZnPoint **points, int *num_points);
 typedef void (*ItemPostScriptMethod)(Item item, PostScriptInfo ps_info);
 
@@ -179,11 +182,13 @@ typedef struct _ItemClassStruct {
   ItemGetAnchorMethod		GetAnchor;
   ItemGetClipVerticesMethod	GetClipVertices;
   ItemCoordsMethod		Coords;
+  ItemContourMethod		Contour;
   ItemComputeCoordinatesMethod	ComputeCoordinates;
   ItemToAreaMethod		ToArea;
   ItemDrawMethod		Draw;
   ItemIsSensitiveMethod		IsSensitive;
   ItemPickMethod		Pick;
+  ItemPickVertexMethod		PickVertex;
   ItemPostScriptMethod		PostScript;
 } ItemClassStruct, *ItemClass;
 
@@ -261,8 +266,8 @@ extern struct _ITEM_P {
   void (*InitClipStack)(struct _WidgetInfo *wi);
   void (*FreeClipStack)(struct _WidgetInfo *wi);
   void (*ResetClipStack)(struct _WidgetInfo *wi);
-  void (*PushClip)(struct _WidgetInfo *wi, ZnPoint *pts, int num_pts,
-		   ZnBool simple, ZnBool set_gc);
+  void (*PushClip)(struct _WidgetInfo *wi, ZnPoly *poly, ZnBool simple,
+		   ZnBool set_gc);
   void (*PopClip)(struct _WidgetInfo *wi, ZnBool set_gc);
   ZnBool (*CurrentClip)(struct _WidgetInfo *wi, Region *reg, ZnBBox **clip_box,
 			ZnBool *simple);
@@ -274,6 +279,7 @@ extern ZnItemClassId	ZnMap;
 extern ZnItemClassId	ZnTabular;
 extern ZnItemClassId	ZnMosaic;
 extern ZnItemClassId	ZnCurve;
+extern ZnItemClassId	ZnBezier;
 extern ZnItemClassId	ZnRectangle;
 extern ZnItemClassId	ZnReticle;
 extern ZnItemClassId	ZnTrack;