# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1044417047 0
# Node ID e6571c4e4d3bda5925da39e53d4a508fe365e26a
# Parent  2581c8b2754f8298ce5b5fc7552d17b3cc92a890
Use the same DW_CLR_* values on all platforms including OS/2... so I
added a lookup table to convert.

diff -r 2581c8b2754f -r e6571c4e4d3b dw.h
--- a/dw.h	Wed Feb 05 00:40:49 2003 +0000
+++ b/dw.h	Wed Feb 05 03:50:47 2003 +0000
@@ -8,6 +8,28 @@
 #define DW_MINOR_VERSION 0
 #define DW_SUB_VERSION 0
 
+/* These corespond to the entries in the color
+ * arrays in the Win32 dw.c, they are also the
+ * same as DOS ANSI colors.
+ */
+#define DW_CLR_BLACK             0
+#define DW_CLR_DARKRED           1
+#define DW_CLR_DARKGREEN         2
+#define DW_CLR_BROWN             3
+#define DW_CLR_DARKBLUE          4
+#define DW_CLR_DARKPINK          5
+#define DW_CLR_DARKCYAN          6
+#define DW_CLR_PALEGRAY          7
+#define DW_CLR_DARKGRAY          8
+#define DW_CLR_RED               9
+#define DW_CLR_GREEN             10
+#define DW_CLR_YELLOW            11
+#define DW_CLR_BLUE              12
+#define DW_CLR_PINK              13
+#define DW_CLR_CYAN              14
+#define DW_CLR_WHITE             15
+#define DW_CLR_DEFAULT           16
+
 #if defined(__OS2__) || defined(__WIN32__) || defined(WINNT) || defined(__EMX__)
 /* OS/2 or Windows */
 
@@ -56,24 +78,6 @@
 #define DW_DT_WORDBREAK          DT_WORDBREAK
 #define DW_DT_ERASERECT          DT_ERASERECT
 
-#define DW_CLR_WHITE             16
-#define DW_CLR_BLACK             17
-#define DW_CLR_DEFAULT           18
-#define DW_CLR_BLUE              CLR_BLUE
-#define DW_CLR_RED               CLR_RED
-#define DW_CLR_PINK              CLR_PINK
-#define DW_CLR_GREEN             CLR_GREEN
-#define DW_CLR_CYAN              CLR_CYAN
-#define DW_CLR_YELLOW            CLR_YELLOW
-#define DW_CLR_DARKGRAY          CLR_DARKGRAY
-#define DW_CLR_DARKBLUE          CLR_DARKBLUE
-#define DW_CLR_DARKRED           CLR_DARKRED
-#define DW_CLR_DARKPINK          CLR_DARKPINK
-#define DW_CLR_DARKGREEN         CLR_DARKGREEN
-#define DW_CLR_DARKCYAN          CLR_DARKCYAN
-#define DW_CLR_BROWN             CLR_BROWN
-#define DW_CLR_PALEGRAY          CLR_PALEGRAY
-
 #ifndef FCF_CLOSEBUTTON
 #define FCF_CLOSEBUTTON            0x04000000L
 #endif
@@ -197,28 +201,6 @@
 #define DW_DT_WORDBREAK          0
 #define DW_DT_ERASERECT          0
 
-/* These corespond to the entries in the color
- * arrays in the Win32 dw.c, they are also the
- * same as DOS ANSI colors.
- */
-#define DW_CLR_BLACK             0
-#define DW_CLR_DARKRED           1
-#define DW_CLR_DARKGREEN         2
-#define DW_CLR_BROWN             3
-#define DW_CLR_DARKBLUE          4
-#define DW_CLR_DARKPINK          5
-#define DW_CLR_DARKCYAN          6
-#define DW_CLR_PALEGRAY          7
-#define DW_CLR_DARKGRAY          8
-#define DW_CLR_RED               9
-#define DW_CLR_GREEN             10
-#define DW_CLR_YELLOW            11
-#define DW_CLR_BLUE              12
-#define DW_CLR_PINK              13
-#define DW_CLR_CYAN              14
-#define DW_CLR_WHITE             15
-#define DW_CLR_DEFAULT           16
-
 #define DW_FCF_TITLEBAR          WS_CAPTION
 #define DW_FCF_SYSMENU           WS_SYSMENU
 #define DW_FCF_MENU              0
@@ -417,24 +399,6 @@
 #define DW_DT_WORDBREAK          (1 << 10)
 #define DW_DT_ERASERECT          (1 << 11)
 
-#define DW_CLR_BLACK             0
-#define DW_CLR_DARKRED           1
-#define DW_CLR_DARKGREEN         2
-#define DW_CLR_BROWN             3
-#define DW_CLR_DARKBLUE          4
-#define DW_CLR_DARKPINK          5
-#define DW_CLR_DARKCYAN          6
-#define DW_CLR_PALEGRAY          7
-#define DW_CLR_DARKGRAY          8
-#define DW_CLR_RED               9
-#define DW_CLR_GREEN             10
-#define DW_CLR_YELLOW            11
-#define DW_CLR_BLUE              12
-#define DW_CLR_PINK              13
-#define DW_CLR_CYAN              14
-#define DW_CLR_WHITE             15
-#define DW_CLR_DEFAULT           16
-
 #define DW_FCF_TITLEBAR          1
 #define DW_FCF_SYSMENU           (1 << 1)
 #define DW_FCF_MENU              (1 << 2)
diff -r 2581c8b2754f -r e6571c4e4d3b os2/dw.c
Binary file os2/dw.c has changed