Modification du type de ZnImage (type d�fini localement d�sormais)

Suppression de ZnUnspecifiedPattern confondu avec ZnUnspecifiedImage
Aligement des types d'attributs avec la doc.

1 files changed, 31 insertions, 35 deletions

diff --git a/generic/Types.h b/generic/Types.h
index a7d27b8..fec26b0 100644
--- a/generic/Types.h
+++ b/generic/Types.h
@@ -55,7 +55,6 @@ typedef XColor		*ZnColor;
 typedef Tk_Font		ZnFont;
 typedef Tk_Window	ZnWindow;
 typedef void		*ZnPtr;
-typedef Tk_Image	ZnImage;
 
 typedef struct {
   ZnPos	x, y;
@@ -150,39 +149,37 @@ typedef struct {
  * in Item.c.
  */
 #define	ZN_CONFIG_END		0
-#define ZN_CONFIG_COLOR		1
-#define ZN_CONFIG_BOOL		2
-#define ZN_CONFIG_PATTERN	3
-#define ZN_CONFIG_PATTERNS	4
-#define ZN_CONFIG_TEXT		5
-#define ZN_CONFIG_FONT		6
-#define ZN_CONFIG_BORDER	7
-#define ZN_CONFIG_RELIEF	8
-#define ZN_CONFIG_DIM		9
-#define ZN_CONFIG_PRI		10
-#define ZN_CONFIG_JUSTIFY	11
-#define ZN_CONFIG_AUTO_JUSTIFY	12
-#define ZN_CONFIG_LINE_END	13
-#define ZN_CONFIG_LABEL_FORMAT	14
-#define ZN_CONFIG_LINE_STYLE	15
-#define ZN_CONFIG_LINE_SHAPE	16
-#define ZN_CONFIG_ITEM		17
-#define ZN_CONFIG_ANGLE		18
-#define ZN_CONFIG_INT		19
-#define ZN_CONFIG_UINT		20
-#define ZN_CONFIG_POINT		21
-#define ZN_CONFIG_RECT		22
-#define ZN_CONFIG_ANCHOR	23
-#define ZN_CONFIG_TAGS		24
-#define ZN_CONFIG_MAP_INFO	25
-#define ZN_CONFIG_IMAGE		26
-#define ZN_CONFIG_LEADER_ANCHORS 27
-#define ZN_CONFIG_JOIN_STYLE	28
-#define	ZN_CONFIG_CAP_STYLE	29
-#define	ZN_CONFIG_GRADIENT	30
-#define ZN_CONFIG_GRADIENTS	31
-#define	ZN_CONFIG_WINDOW	32
-#define	ZN_CONFIG_ALPHA		33
+#define ZN_CONFIG_BOOL		1
+#define ZN_CONFIG_BITMAP	2
+#define ZN_CONFIG_BITMAP_LIST	3
+#define ZN_CONFIG_STRING	4
+#define ZN_CONFIG_FONT		5
+#define ZN_CONFIG_EDGE_LIST	6
+#define ZN_CONFIG_RELIEF	7
+#define ZN_CONFIG_DIM		8
+#define ZN_CONFIG_PRI		9
+#define ZN_CONFIG_ALIGNMENT	10
+#define ZN_CONFIG_AUTO_ALIGNMENT 11
+#define ZN_CONFIG_LINE_END	12
+#define ZN_CONFIG_LABEL_FORMAT	13
+#define ZN_CONFIG_LINE_STYLE	14
+#define ZN_CONFIG_LINE_SHAPE	15
+#define ZN_CONFIG_ITEM		16
+#define ZN_CONFIG_ANGLE		17
+#define ZN_CONFIG_INT		18
+#define ZN_CONFIG_UINT		19
+#define ZN_CONFIG_POINT		20
+#define ZN_CONFIG_ANCHOR	21
+#define ZN_CONFIG_TAG_LIST	22
+#define ZN_CONFIG_MAP_INFO	23
+#define ZN_CONFIG_IMAGE		24
+#define ZN_CONFIG_LEADER_ANCHORS 25
+#define ZN_CONFIG_JOIN_STYLE	26
+#define	ZN_CONFIG_CAP_STYLE	27
+#define	ZN_CONFIG_GRADIENT	28
+#define ZN_CONFIG_GRADIENT_LIST	29
+#define	ZN_CONFIG_WINDOW	30
+#define	ZN_CONFIG_ALPHA		31
 
 #define ZN_DRAW_FLAG	1 << 0
 #define	ZN_COORDS_FLAG	1 << 1
@@ -347,7 +344,6 @@ typedef struct {
 #define ZnRealloc(ptr, size)	((void *)ckrealloc((void *)(ptr), size))
 #define ZnWarning(msg)		(fprintf(stderr, "%s", (msg)))
   
-#define ZnUnspecifiedPattern	None
 #define ZnUnspecifiedImage	None
 #define ZnUnspecifiedColor	NULL
 #define ZN_OK			TCL_OK