Change new colors to GFX_RED instead of GFXRED. Use the new color defs

24 files changed, 101 insertions, 97 deletions

diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c
index ad5386fc..f1df787a 100644
--- a/src/gdisp/gdisp.c
+++ b/src/gdisp/gdisp.c
@@ -15,7 +15,7 @@
 // Number of milliseconds for the startup logo - 0 means disabled.
 #if GDISP_NEED_STARTUP_LOGO
 	#define GDISP_STARTUP_LOGO_TIMEOUT		1000
-	#define GDISP_STARTUP_LOGO_COLOR		White
+	#define GDISP_STARTUP_LOGO_COLOR		GFX_WHITE
 #else
 	#define GDISP_STARTUP_LOGO_TIMEOUT		0
 #endif
diff --git a/src/gdisp/gdisp_colors.h b/src/gdisp/gdisp_colors.h
index bf1a3f3b..323303e0 100644
--- a/src/gdisp/gdisp_colors.h
+++ b/src/gdisp/gdisp_colors.h
@@ -80,53 +80,53 @@ typedef uint16_t	colorformat;
  * @name   Some basic colors
  * @{
  */
-#define GFXWHITE		HTML2COLOR(0xFFFFFF)
-#define GFXBLACK		HTML2COLOR(0x000000)
-#define GFXGRAY			HTML2COLOR(0x808080)
-#define GFXGREY			GFXGRAY
-#define GFXBLUE			HTML2COLOR(0x0000FF)
-#define GFXRED			HTML2COLOR(0xFF0000)
-#define GFXFUCHSIA		HTML2COLOR(0xFF00FF)
-#define GFXMAGENTA		GFXFUCHSIA
-#define GFXGREEN		HTML2COLOR(0x008000)
-#define GFXYELLOW		HTML2COLOR(0xFFFF00)
-#define GFXAQUA			HTML2COLOR(0x00FFFF)
-#define GFXCYAN			GFXAQUA
-#define GFXLIME			HTML2COLOR(0x00FF00)
-#define GFXMAROON		HTML2COLOR(0x800000)
-#define GFXNAVY			HTML2COLOR(0x000080)
-#define GFXOLIVE		HTML2COLOR(0x808000)
-#define GFXPURPLE		HTML2COLOR(0x800080)
-#define GFXSILVER		HTML2COLOR(0xC0C0C0)
-#define GFXTEAL			HTML2COLOR(0x008080)
-#define GFXORANGE		HTML2COLOR(0xFFA500)
-#define GFXPINK			HTML2COLOR(0xFFC0CB)
-#define GFXSKYBLUE		HTML2COLOR(0x87CEEB)
+#define GFX_WHITE		HTML2COLOR(0xFFFFFF)
+#define GFX_BLACK		HTML2COLOR(0x000000)
+#define GFX_GRAY		HTML2COLOR(0x808080)
+#define GFX_GREY		GFXGRAY
+#define GFX_BLUE		HTML2COLOR(0x0000FF)
+#define GFX_RED			HTML2COLOR(0xFF0000)
+#define GFX_FUCHSIA		HTML2COLOR(0xFF00FF)
+#define GFX_MAGENTA		GFXFUCHSIA
+#define GFX_GREEN		HTML2COLOR(0x008000)
+#define GFX_YELLOW		HTML2COLOR(0xFFFF00)
+#define GFX_AQUA		HTML2COLOR(0x00FFFF)
+#define GFX_CYAN		GFXAQUA
+#define GFX_LIME		HTML2COLOR(0x00FF00)
+#define GFX_MAROON		HTML2COLOR(0x800000)
+#define GFX_NAVY		HTML2COLOR(0x000080)
+#define GFX_OLIVE		HTML2COLOR(0x808000)
+#define GFX_PURPLE		HTML2COLOR(0x800080)
+#define GFX_SILVER		HTML2COLOR(0xC0C0C0)
+#define GFX_TEAL		HTML2COLOR(0x008080)
+#define GFX_ORANGE		HTML2COLOR(0xFFA500)
+#define GFX_PINK		HTML2COLOR(0xFFC0CB)
+#define GFX_SKYBLUE		HTML2COLOR(0x87CEEB)
 /** @} */
 
 #if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS
-	#define White			GFXWHITE
-	#define Black			GFXBLACK
-	#define Gray			GFXGRAY
-	#define Grey			GFXGREY
-	#define Blue			GFXBLUE
-	#define Red				GFXRED
-	#define Fuchsia			GFXFUCHSIA
-	#define Magenta			GFXMAGENTA
-	#define Green			GFXGREEN
-	#define Yellow			GFXYELLOW
-	#define Aqua			GFXAQUA
-	#define Cyan			GFXCYAN
-	#define Lime			GFXLIME
-	#define Maroon			GFXMAROON
-	#define Navy			GFXNAVY
-	#define Olive			GFXOLIVE
-	#define Purple			GFXPURPLE
-	#define Silver			GFXSILVER
-	#define Teal			GFXTEAL
-	#define Orange			GFXORANGE
-	#define Pink			GFXPINK
-	#define SkyBlue			GFXSKYBLUE
+	#define White			GFX_WHITE
+	#define Black			GFX_BLACK
+	#define Gray			GFX_GRAY
+	#define Grey			GFX_GREY
+	#define Blue			GFX_BLUE
+	#define Red				GFX_RED
+	#define Fuchsia			GFX_FUCHSIA
+	#define Magenta			GFX_MAGENTA
+	#define Green			GFX_GREEN
+	#define Yellow			GFX_YELLOW
+	#define Aqua			GFX_AQUA
+	#define Cyan			GFX_CYAN
+	#define Lime			GFX_LIME
+	#define Maroon			GFX_MAROON
+	#define Navy			GFX_NAVY
+	#define Olive			GFX_OLIVE
+	#define Purple			GFX_PURPLE
+	#define Silver			GFX_SILVER
+	#define Teal			GFX_TEAL
+	#define Orange			GFX_ORANGE
+	#define Pink			GFX_PINK
+	#define SkyBlue			GFX_SKYBLUE
 #endif
 
 #if defined(__DOXYGEN__)
diff --git a/src/gdisp/gdisp_image.c b/src/gdisp/gdisp_image.c
index ddef0522..cc137209 100644
--- a/src/gdisp/gdisp_image.c
+++ b/src/gdisp/gdisp_image.c
@@ -115,7 +115,7 @@ gdispImageError gdispImageOpenGFile(gdispImage *img, GFILE *f) {
 	if (!f)
 		return GDISP_IMAGE_ERR_NOSUCHFILE;
 	img->f = f;
-	img->bgcolor = White;
+	img->bgcolor = GFX_WHITE;
 	for(img->fns = ImageHandlers; img->fns < ImageHandlers+sizeof(ImageHandlers)/sizeof(ImageHandlers[0]); img->fns++) {
 		err = img->fns->open(img);
 		if (err != GDISP_IMAGE_ERR_BADFORMAT) {
diff --git a/src/gdisp/gdisp_options.h b/src/gdisp/gdisp_options.h
index 8fb409a2..06aeaf52 100644
--- a/src/gdisp/gdisp_options.h
+++ b/src/gdisp/gdisp_options.h
@@ -223,7 +223,7 @@
 	 * @brief	Define the initial background color for all displays in the system.
 	 */
 	#ifndef GDISP_STARTUP_COLOR
-		#define GDISP_STARTUP_COLOR				Black
+		#define GDISP_STARTUP_COLOR				GFX_BLACK
 	#endif
 	/**
 	 * @brief	Define the default orientation for all displays in the system.
diff --git a/src/ginput/ginput_mouse.c b/src/ginput/ginput_mouse.c
index f60faccb..356ad11e 100644
--- a/src/ginput/ginput_mouse.c
+++ b/src/ginput/ginput_mouse.c
@@ -33,9 +33,9 @@
 #else
 	#define CALIBRATION_FONT2			"* Narrow"
 #endif
-#define CALIBRATION_BACKGROUND			Blue
+#define CALIBRATION_BACKGROUND			GFX_BLUE
 
-#define CALIBRATION_CROSS_COLOR1		White
+#define CALIBRATION_CROSS_COLOR1		GFX_WHITE
 #define CALIBRATION_CROSS_COLOR2		RGB2COLOR(184,158,131)
 #define CALIBRATION_CROSS_INNERGAP		2
 #define CALIBRATION_CROSS_RADIUS		15
@@ -47,8 +47,8 @@
 #endif
 #define CALIBRATION_TITLE_Y				5
 #define CALIBRATION_TITLE_HEIGHT		30
-#define CALIBRATION_TITLE_COLOR			White
-#define CALIBRATION_TITLE_BACKGROUND	Blue
+#define CALIBRATION_TITLE_COLOR			GFX_WHITE
+#define CALIBRATION_TITLE_BACKGROUND	GFX_BLUE
 
 #ifdef GINPUT_TOUCH_CALIBRATION_ERROR
 	#define CALIBRATION_ERROR_TEXT		GINPUT_TOUCH_CALIBRATION_ERROR
@@ -56,8 +56,8 @@
 	#define CALIBRATION_ERROR_TEXT		"Calibration Failed!"
 #endif
 #define CALIBRATION_ERROR_DELAY			3000
-#define CALIBRATION_ERROR_COLOR			Red
-#define CALIBRATION_ERROR_BACKGROUND	Yellow
+#define CALIBRATION_ERROR_COLOR			GFX_RED
+#define CALIBRATION_ERROR_BACKGROUND	GFX_YELLOW
 #define CALIBRATION_ERROR_Y				35
 #define CALIBRATION_ERROR_HEIGHT		40
 
@@ -500,7 +500,7 @@ static void MousePoll(void *param) {
         }
 
 		// Set up the calibration display
-		gdispGClear(m->display, Blue);
+		gdispGClear(m->display, GFX_BLUE);
 		#if GDISP_NEED_TEXT
 			gdispGFillStringBox(m->display,
 								0, CALIBRATION_TITLE_Y, w, CALIBRATION_TITLE_HEIGHT,
diff --git a/src/gos/gos_raw32.c b/src/gos/gos_raw32.c
index 72edbb83..63769d65 100644
--- a/src/gos/gos_raw32.c
+++ b/src/gos/gos_raw32.c
@@ -59,15 +59,19 @@ void _gosDeinit(void)
 	#ifndef _WIN32_WINNT
 		#define _WIN32_WINNT 0x0501			// Windows XP and up
 	#endif
-	#undef Red
-	#undef Green
-	#undef Blue
+	#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS
+		#undef Red
+		#undef Green
+		#undef Blue
+	#endif
 	#define WIN32_LEAN_AND_MEAN
 	#include <windows.h>
 	#undef WIN32_LEAN_AND_MEAN
-	#define Blue			HTML2COLOR(0x0000FF)
-	#define Red				HTML2COLOR(0xFF0000)
-	#define Green			HTML2COLOR(0x008000)
+	#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS
+		#define Red			GFX_RED
+		#define Green		GFX_GREEN
+		#define Blue		GFX_BLUE
+	#endif
 
 	#include <stdio.h>
 	systemticks_t gfxSystemTicks(void)						{ return GetTickCount(); }
diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c
index c5082ea0..2de0c125 100644
--- a/src/gwin/gwin.c
+++ b/src/gwin/gwin.c
@@ -30,8 +30,8 @@ static const gwinVMT basegwinVMT = {
 		0,						// The after-clear routine
 };
 
-static color_t	defaultFgColor = White;
-static color_t	defaultBgColor = Black;
+static color_t	defaultFgColor = GFX_WHITE;
+static color_t	defaultBgColor = GFX_BLACK;
 #if GDISP_NEED_TEXT
 	static font_t	defaultFont;
 #endif
diff --git a/src/gwin/gwin.h b/src/gwin/gwin.h
index 1331a874..54421bd4 100644
--- a/src/gwin/gwin.h
+++ b/src/gwin/gwin.h
@@ -203,7 +203,7 @@ extern "C" {
 	 * @param[in] pInit		How to initialise the window
 	 *
 	 * @note				The drawing color and the background color get set to the current defaults. If you haven't called
-	 * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are White and Black respectively.
+	 * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are GFX_WHITE and GFX_BLACK respectively.
 	 * @note				The font gets set to the current default font. If you haven't called @p gwinSetDefaultFont() then there
 	 * 						is no default font and text drawing operations will no nothing.
 	 * @note				A basic window does not save the drawing state. It is not automatically redrawn if the window is moved or
diff --git a/src/gwin/gwin_button.c b/src/gwin/gwin_button.c
index f4be41a1..8b3a2b6b 100644
--- a/src/gwin/gwin_button.c
+++ b/src/gwin/gwin_button.c
@@ -192,8 +192,8 @@ static const GColorSet *getButtonColors(GWidgetObject *gw) {
 		pcol = getButtonColors(gw);
 	
 		/* Fill the box blended from variants of the fill color */
-		tcol = gdispBlendColor(White, pcol->fill, BTN_TOP_FADE);
-		bcol = gdispBlendColor(Black, pcol->fill, BTN_BOTTOM_FADE);
+		tcol = gdispBlendColor(GFX_WHITE, pcol->fill, BTN_TOP_FADE);
+		bcol = gdispBlendColor(GFX_BLACK, pcol->fill, BTN_BOTTOM_FADE);
 		dalpha = FIXED(255)/gw->g.height;
 		for(alpha = 0, i = 0; i < gw->g.height; i++, alpha += dalpha)
 			gdispGDrawLine(gw->g.display, gw->g.x, gw->g.y+i, gw->g.x+gw->g.width-2, gw->g.y+i, gdispBlendColor(bcol, tcol, NONFIXED(alpha)));
diff --git a/src/gwin/gwin_button.h b/src/gwin/gwin_button.h
index 77751c04..ba3bc354 100644
--- a/src/gwin/gwin_button.h
+++ b/src/gwin/gwin_button.h
@@ -71,7 +71,7 @@ extern "C" {
  * @param[in] pInit		The initialisation parameters
  *
  * @note				The drawing color and the background color get set to the current defaults. If you haven't called
- * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are White and Black respectively.
+ * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are GFX_WHITE and GFX_BLACK respectively.
  * @note				The font gets set to the current default font. If you haven't called @p gwinSetDefaultFont() then there
  * 						is no default font and text drawing operations will no nothing.
  * @note				A button remembers its normal drawing state. If there is a window manager then it is automatically
diff --git a/src/gwin/gwin_checkbox.c b/src/gwin/gwin_checkbox.c
index 1160f0b1..1b3d395a 100644
--- a/src/gwin/gwin_checkbox.c
+++ b/src/gwin/gwin_checkbox.c
@@ -267,8 +267,8 @@ void gwinCheckboxDraw_CheckOnRight(GWidgetObject *gw, void *param) {
 		#endif
 
 		/* Fill the box blended from variants of the fill color */
-		tcol = gdispBlendColor(White, pcol->fill, CHK_TOP_FADE);
-		bcol = gdispBlendColor(Black, pcol->fill, CHK_BOTTOM_FADE);
+		tcol = gdispBlendColor(GFX_WHITE, pcol->fill, CHK_TOP_FADE);
+		bcol = gdispBlendColor(GFX_BLACK, pcol->fill, CHK_BOTTOM_FADE);
 		dalpha = FIXED(255)/gw->g.height;
 		for(alpha = 0, i = 0; i < gw->g.height; i++, alpha += dalpha)
 			gdispGDrawLine(gw->g.display, gw->g.x, gw->g.y+i, gw->g.x+gw->g.width-2, gw->g.y+i, gdispBlendColor(bcol, tcol, NONFIXED(alpha)));
diff --git a/src/gwin/gwin_checkbox.h b/src/gwin/gwin_checkbox.h
index b4a1c811..2fba95c1 100644
--- a/src/gwin/gwin_checkbox.h
+++ b/src/gwin/gwin_checkbox.h
@@ -74,7 +74,7 @@ extern "C" {
  * @param[in] pInit		The initialization parameters to use
  *
  * @note				The drawing color and the background color get set to the current defaults. If you haven't called
- * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are White and Black respectively.
+ * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are GFX_WHITE and GFX_BLACK respectively.
  * @note				The font gets set to the current default font. If you haven't called @p gwinSetDefaultFont() then there
  * 						is no default font and text drawing operations will no nothing.
  * @note				A checkbox remembers its normal drawing state. If there is a window manager then it is automatically
diff --git a/src/gwin/gwin_console.c b/src/gwin/gwin_console.c
index 71d0905a..2d99b153 100644
--- a/src/gwin/gwin_console.c
+++ b/src/gwin/gwin_console.c
@@ -116,21 +116,21 @@
 	static color_t ESCPrintColor(GConsoleObject *gcw) {
 		switch(gcw->currattr & (ESC_REDBIT|ESC_GREENBIT|ESC_BLUEBIT|ESC_USECOLOR)) {
 		case (ESC_USECOLOR):
-			return Black;
+			return GFX_BLACK;
 		case (ESC_USECOLOR|ESC_REDBIT):
-			return Red;
+			return GFX_RED;
 		case (ESC_USECOLOR|ESC_GREENBIT):
-			return Green;
+			return GFX_GREEN;
 		case (ESC_USECOLOR|ESC_REDBIT|ESC_GREENBIT):
-			return Yellow;
+			return GFX_YELLOW;
 		case (ESC_USECOLOR|ESC_BLUEBIT):
-			return Blue;
+			return GFX_BLUE;
 		case (ESC_USECOLOR|ESC_REDBIT|ESC_BLUEBIT):
-			return Magenta;
+			return GFX_MAGENTA;
 		case (ESC_USECOLOR|ESC_GREENBIT|ESC_BLUEBIT):
-			return Cyan;
+			return GFX_CYAN;
 		case (ESC_USECOLOR|ESC_REDBIT|ESC_GREENBIT|ESC_BLUEBIT):
-			return White;
+			return GFX_WHITE;
 		default:
 			return gcw->g.color;
 		}
diff --git a/src/gwin/gwin_console.h b/src/gwin/gwin_console.h
index 6b0f3fe6..fcfca35e 100644
--- a/src/gwin/gwin_console.h
+++ b/src/gwin/gwin_console.h
@@ -69,7 +69,7 @@ extern "C" {
  * @param[in] pInit		The initialization parameters to use
  *
  * @note				The drawing color and the background color get set to the current defaults. If you haven't called
- * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are White and Black respectively.
+ * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are GFX_WHITE and GFX_BLACK respectively.
  * @note				The font gets set to the current default font. If you haven't called @p gwinSetDefaultFont() then there
  * 						is no default font and text drawing operations will no nothing.
  * @note				On creation even if the window is visible it is not automatically cleared.
diff --git a/src/gwin/gwin_gl3d.h b/src/gwin/gwin_gl3d.h
index fd1220b0..5dbfa893 100644
--- a/src/gwin/gwin_gl3d.h
+++ b/src/gwin/gwin_gl3d.h
@@ -51,7 +51,7 @@ extern "C" {
  * @param[in] pInit		The initialization parameters to use
  *
  * @note				The drawing color and the background color get set to the current defaults. If you haven't called
- * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are White and Black respectively.
+ * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are GFX_WHITE and GFX_BLACK respectively.
  * @note				The font gets set to the current default font. If you haven't called @p gwinSetDefaultFont() then there
  * 						is no default font and text drawing operations will no nothing.
  * @note				The dimensions and position may be changed to fit on the real screen.
diff --git a/src/gwin/gwin_graph.c b/src/gwin/gwin_graph.c
index 6f0ce2a4..c729103d 100644
--- a/src/gwin/gwin_graph.c
+++ b/src/gwin/gwin_graph.c
@@ -20,12 +20,12 @@
 #define GGRAPH_ARROW_SIZE					5
 
 static const GGraphStyle GGraphDefaultStyle = {
-	{ GGRAPH_POINT_DOT, 0, White },			// point
-	{ GGRAPH_LINE_DOT, 2, Gray },			// line
-	{ GGRAPH_LINE_SOLID, 0, White },		// x axis
-	{ GGRAPH_LINE_SOLID, 0, White },		// y axis
-	{ GGRAPH_LINE_NONE, 0, White, 0 },		// x grid
-	{ GGRAPH_LINE_NONE, 0, White, 0 },		// y grid
+	{ GGRAPH_POINT_DOT, 0, GFX_WHITE },			// point
+	{ GGRAPH_LINE_DOT, 2, GFX_GRAY },			// line
+	{ GGRAPH_LINE_SOLID, 0, GFX_WHITE },		// x axis
+	{ GGRAPH_LINE_SOLID, 0, GFX_WHITE },		// y axis
+	{ GGRAPH_LINE_NONE, 0, GFX_WHITE, 0 },		// x grid
+	{ GGRAPH_LINE_NONE, 0, GFX_WHITE, 0 },		// y grid
 	GWIN_GRAPH_STYLE_XAXIS_ARROWS|GWIN_GRAPH_STYLE_YAXIS_ARROWS		// flags
 };
 
diff --git a/src/gwin/gwin_graph.h b/src/gwin/gwin_graph.h
index 61b411a2..76059a6f 100644
--- a/src/gwin/gwin_graph.h
+++ b/src/gwin/gwin_graph.h
@@ -98,7 +98,7 @@ extern "C" {
  * @param[in] pInit		The initialization parameters to use
  *
  * @note				The drawing color and the background color get set to the current defaults. If you haven't called
- * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are White and Black respectively.
+ * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are GFX_WHITE and GFX_BLACK respectively.
  * @note				The font gets set to the current default font. If you haven't called @p gwinSetDefaultFont() then there
  * 						is no default font and text drawing operations will no nothing.
  * @note				The dimensions and position may be changed to fit on the real screen.
diff --git a/src/gwin/gwin_keyboard.h b/src/gwin/gwin_keyboard.h
index 68bf215f..f98d6570 100644
--- a/src/gwin/gwin_keyboard.h
+++ b/src/gwin/gwin_keyboard.h
@@ -77,7 +77,7 @@ extern "C" {
  * @param[in] pInit		The initialisation parameters
  *
  * @note				The drawing color and the background color get set to the current defaults. If you haven't called
- * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are White and Black respectively.
+ * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are GFX_WHITE and GFX_BLACK respectively.
  * @note				The font gets set to the current default font. If you haven't called @p gwinSetDefaultFont() then there
  * 						is no default font and text drawing operations will no nothing.
  * @note				A keyboard remembers its normal drawing state. If there is a window manager then it is automatically
diff --git a/src/gwin/gwin_list.h b/src/gwin/gwin_list.h
index ad64be75..041bbb68 100644
--- a/src/gwin/gwin_list.h
+++ b/src/gwin/gwin_list.h
@@ -113,7 +113,7 @@ extern "C" {
  * @brief				Create a list widget
  *
  * @note				The drawing color and the background color get set to the current defaults. If you haven't called
- *						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are Black and White.
+ *						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are GFX_WHITE and GFX_BLACK.
  * @note				The font gets set to the current default font. If you haven't called @p gwinSetDefaultFont() then
  *						there is no default font and text drawing operations will not display anything.
  * @note				A list remembers its normal drawing state. If there is a window manager then it is automatically
diff --git a/src/gwin/gwin_progressbar.h b/src/gwin/gwin_progressbar.h
index 646f6954..95feaf4a 100644
--- a/src/gwin/gwin_progressbar.h
+++ b/src/gwin/gwin_progressbar.h
@@ -49,7 +49,7 @@ extern "C" {
  * @param[in] pInit		The initialization parameters to use
  *
  * @note				The drawing color and the background color get set to the current defaults. If you haven't called
- * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are White and Black respectively.
+ * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are GFX_WHITE and GFX_BLACK respectively.
  * @note				The font gets set to the current default font. If you haven't called @p gwinSetDefaultFont() then there
  * 						is no default font and text drawing operations will no nothing.
  * @note				A progressbar remembers its normal drawing state. If there is a window manager then it is automatically
diff --git a/src/gwin/gwin_radio.c b/src/gwin/gwin_radio.c
index 6d9bd60e..47110c35 100644
--- a/src/gwin/gwin_radio.c
+++ b/src/gwin/gwin_radio.c
@@ -249,8 +249,8 @@ void gwinRadioDraw_Radio(GWidgetObject *gw, void *param) {
 		pcol = getDrawColors(gw);
 	
 		/* Fill the box blended from variants of the fill color */
-		tcol = gdispBlendColor(White, pcol->fill, GRADIO_TOP_FADE);
-		bcol = gdispBlendColor(Black, pcol->fill, GRADIO_BOTTOM_FADE);
+		tcol = gdispBlendColor(GFX_WHITE, pcol->fill, GRADIO_TOP_FADE);
+		bcol = gdispBlendColor(GFX_BLACK, pcol->fill, GRADIO_BOTTOM_FADE);
 		dalpha = FIXED(255)/gw->g.height;
 		for(alpha = 0, i = 0; i < gw->g.height; i++, alpha += dalpha)
 			gdispGDrawLine(gw->g.display, gw->g.x, gw->g.y+i, gw->g.x+gw->g.width-2, gw->g.y+i, gdispBlendColor(bcol, tcol, NONFIXED(alpha)));
@@ -278,8 +278,8 @@ void gwinRadioDraw_Radio(GWidgetObject *gw, void *param) {
 			gdispGDrawLine(gw->g.display, gw->g.x+gw->g.width-1, gw->g.y+GRADIO_TAB_CNR, gw->g.x+gw->g.width-1, gw->g.y+gw->g.height-1, tcol);
 		} else {
 			/* Fill the box blended from variants of the fill color */
-			tcol = gdispBlendColor(White, pcol->fill, GRADIO_TOP_FADE);
-			bcol = gdispBlendColor(Black, pcol->fill, GRADIO_BOTTOM_FADE);
+			tcol = gdispBlendColor(GFX_WHITE, pcol->fill, GRADIO_TOP_FADE);
+			bcol = gdispBlendColor(GFX_BLACK, pcol->fill, GRADIO_BOTTOM_FADE);
 			dalpha = FIXED(255)/gw->g.height;
 			for(alpha = 0, i = 0; i < gw->g.height; i++, alpha += dalpha)
 				gdispGDrawLine(gw->g.display, gw->g.x, gw->g.y+i, gw->g.x+gw->g.width-2, gw->g.y+i, gdispBlendColor(bcol, tcol, NONFIXED(alpha)));
diff --git a/src/gwin/gwin_radio.h b/src/gwin/gwin_radio.h
index 161cbb19..514620c1 100644
--- a/src/gwin/gwin_radio.h
+++ b/src/gwin/gwin_radio.h
@@ -81,7 +81,7 @@ extern "C" {
  * @note				Only one radio button in any group is ever pressed at one time. Pressing one radio button will
  * 						release all others in the group.
  * @note				The drawing color and the background color get set to the current defaults. If you haven't called
- * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are White and Black respectively.
+ * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are GFX_WHITE and GFX_BLACK respectively.
  * @note				The font gets set to the current default font. If you haven't called @p gwinSetDefaultFont() then there
  * 						is no default font and text drawing operations will no nothing.
  * @note				A radio button remembers its normal drawing state. If there is a window manager then it is automatically
diff --git a/src/gwin/gwin_slider.h b/src/gwin/gwin_slider.h
index 616663be..c388417d 100644
--- a/src/gwin/gwin_slider.h
+++ b/src/gwin/gwin_slider.h
@@ -82,7 +82,7 @@ extern "C" {
  * @param[in] pInit		The initialization parameters to use
  *
  * @note				The drawing color and the background color get set to the current defaults. If you haven't called
- * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are White and Black respectively.
+ * 						@p gwinSetDefaultColor() or @p gwinSetDefaultBgColor() then these are GFX_WHITE and GFX_BLACK respectively.
  * @note				The font gets set to the current default font. If you haven't called @p gwinSetDefaultFont() then there
  * 						is no default font and text drawing operations will no nothing.
  * @note				A slider remembers its normal drawing state. If there is a window manager then it is automatically
diff --git a/src/gwin/gwin_tabset.c b/src/gwin/gwin_tabset.c
index 148a0bb1..0bb18c18 100644
--- a/src/gwin/gwin_tabset.c
+++ b/src/gwin/gwin_tabset.c
@@ -444,8 +444,8 @@ void gwinTabsetSetTab(GHandle gh) {
 		pcol = (gw->g.flags & GWIN_FLG_SYSENABLED) ? &gw->pstyle->enabled : &gw->pstyle->disabled;
 
 		/* Fill the box blended from variants of the fill color */
-		tcol = gdispBlendColor(White, pcol->fill, GTABSET_TOP_FADE);
-		bcol = gdispBlendColor(Black, pcol->fill, GTABSET_BOTTOM_FADE);
+		tcol = gdispBlendColor(GFX_WHITE, pcol->fill, GTABSET_TOP_FADE);
+		bcol = gdispBlendColor(GFX_BLACK, pcol->fill, GTABSET_BOTTOM_FADE);
 		for(alpha = 0, i = 0; i < GWIN_TABSET_TABHEIGHT; i++, alpha += FIXED(255)/GWIN_TABSET_TABHEIGHT)
 			gdispGDrawLine(gw->g.display, gw->g.x+x, gw->g.y+y+i, gw->g.x+x+w-2, gw->g.y+y+i, gdispBlendColor(bcol, tcol, NONFIXED(alpha)));
 		gdispGDrawLine(gw->g.display, gw->g.x+x+w-1, gw->g.y+y, gw->g.x+x+w-1, gw->g.y+y+GWIN_TABSET_TABHEIGHT-1, pcol->edge);