Constantes li�es aux nouveaux reliefs.

Modif de la fonction ZnWarning pour retirer le newline.

1 files changed, 18 insertions, 7 deletions

diff --git a/generic/Types.h b/generic/Types.h
index 130cd95..a7d27b8 100644
--- a/generic/Types.h
+++ b/generic/Types.h
@@ -282,12 +282,23 @@ typedef unsigned char	LineShape;
 /*
  * Type and constant values for relief styles.
  */
-typedef int	ReliefStyle;	/* Keep it an int to keep Tk happy */
-#define RELIEF_BEVEL_OUT	TK_RELIEF_RAISED
-#define RELIEF_FLAT		TK_RELIEF_FLAT
-#define RELIEF_BEVEL_IN		TK_RELIEF_SUNKEN
-#define RELIEF_GROOVE		TK_RELIEF_GROOVE
-#define RELIEF_RIDGE		TK_RELIEF_RIDGE
+typedef int	ReliefStyle;
+#define RELIEF_FLAT		0
+#define RELIEF_RAISED		1
+#define RELIEF_SUNKEN		2
+#define RELIEF_GROOVE		(RELIEF_TWO_FACES|RELIEF_SUNKEN)
+#define RELIEF_RIDGE		(RELIEF_TWO_FACES|RELIEF_RAISED)
+#define RELIEF_ROUND_SUNKEN	(RELIEF_ROUND|RELIEF_SUNKEN)
+#define RELIEF_ROUND_RAISED	(RELIEF_ROUND|RELIEF_RAISED)
+#define RELIEF_ROUND_GROOVE	(RELIEF_ROUND|RELIEF_TWO_FACES|RELIEF_SUNKEN)
+#define RELIEF_ROUND_RIDGE	(RELIEF_ROUND|RELIEF_TWO_FACES|RELIEF_RAISED)
+#define RELIEF_SUNKEN_RULE	(RELIEF_ROUND|RELIEF_TWO_FACES|RELIEF_SUNKEN|RELIEF_RULE)
+#define RELIEF_RAISED_RULE	(RELIEF_ROUND|RELIEF_TWO_FACES|RELIEF_RAISED|RELIEF_RULE)
+#define RELIEF_ROUND		0x80
+#define	RELIEF_TWO_FACES	0x40
+#define	RELIEF_RULE		0x20
+#define	RELIEF_MASK		0x3
+
 /*
  * Number of steps for relief drawing. This translate in
  * RELIEF_STEPS*2+1 color shades in the color gradient.
@@ -334,7 +345,7 @@ typedef struct {
 #define ZnMalloc(size)		((void *)ckalloc(size))
 #define ZnFree(ptr)		(ckfree((char *)(ptr)))
 #define ZnRealloc(ptr, size)	((void *)ckrealloc((void *)(ptr), size))
-#define ZnWarning(msg)		(fprintf(stderr, "%s\n", (msg)))
+#define ZnWarning(msg)		(fprintf(stderr, "%s", (msg)))
   
 #define ZnUnspecifiedPattern	None
 #define ZnUnspecifiedImage	None