2 files changed, 23 insertions, 23 deletions

diff --git a/demos/tools/uGFXnetDisplay/gfxconf.h b/demos/tools/uGFXnetDisplay/gfxconf.h
index 4df44bc4..4cbe4981 100644
--- a/demos/tools/uGFXnetDisplay/gfxconf.h
+++ b/demos/tools/uGFXnetDisplay/gfxconf.h
@@ -9,30 +9,30 @@
 #define _GFXCONF_H
 
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS	FALSE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_LINUX		FALSE
-//#define GFX_USE_OS_OSX		FALSE
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
+//#define GFX_USE_OS_WIN32		GFXOFF
+//#define GFX_USE_OS_LINUX		GFXOFF
+//#define GFX_USE_OS_OSX		GFXOFF
 
 /* GFX sub-systems to turn on */
-#define GFX_USE_GDISP				TRUE
-#define GFX_USE_GEVENT				TRUE
-#define GFX_USE_GTIMER				TRUE
-#define GFX_USE_GINPUT				TRUE
+#define GFX_USE_GDISP				GFXON
+#define GFX_USE_GEVENT				GFXON
+#define GFX_USE_GTIMER				GFXON
+#define GFX_USE_GINPUT				GFXON
 
 /* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION		TRUE
-#define GDISP_NEED_TEXT				TRUE
-#define GDISP_NEED_CONTROL			TRUE
-#define GDISP_NEED_SCROLL			TRUE
-#define GDISP_NEED_PIXELREAD		TRUE
-#define GDISP_NEED_STREAMING		TRUE
+#define GDISP_NEED_VALIDATION		GFXON
+#define GDISP_NEED_TEXT				GFXON
+#define GDISP_NEED_CONTROL			GFXON
+#define GDISP_NEED_SCROLL			GFXON
+#define GDISP_NEED_PIXELREAD		GFXON
+#define GDISP_NEED_STREAMING		GFXON
 
 /* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_UI2		TRUE
+#define GDISP_INCLUDE_FONT_UI2		GFXON
 
 /* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE			TRUE
+#define GINPUT_NEED_MOUSE			GFXON
 
 /* We need to use this specific pixel format to match the network protocol */
 #define GDISP_PIXELFORMAT			GDISP_PIXELFORMAT_RGB565
diff --git a/demos/tools/uGFXnetDisplay/main.c b/demos/tools/uGFXnetDisplay/main.c
index 26ae4b89..6f4ad4b6 100644
--- a/demos/tools/uGFXnetDisplay/main.c
+++ b/demos/tools/uGFXnetDisplay/main.c
@@ -20,14 +20,14 @@
 // Do we wish to use old style socket calls. Some socket libraries only support the old version.
 // It is better to use the new version where possible however as it also supports IPv6.
 #ifndef OLD_STYLE_SOCKETS
-	#define OLD_STYLE_SOCKETS		FALSE
+	#define OLD_STYLE_SOCKETS		GFXOFF
 #endif
 
 // Which operating systems support a command line
 #if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_OSX || GFX_USE_OS_LINUX
-	#define EMBEDED_OS	FALSE
+	#define EMBEDED_OS	GFXOFF
 #else
-	#define EMBEDED_OS	TRUE
+	#define EMBEDED_OS	GFXON
 #endif
 
 #if GNETCODE_VERSION != GNETCODE_VERSION_1_0
@@ -103,7 +103,7 @@
 			COMPILER_WARNING("GDISP: uGFXnet - LWIP sockets are not thread-safe. GDISP_GFXNET_UNSAFE_SOCKETS has been turned on for you.")
 		#endif
 		#undef GDISP_GFXNET_UNSAFE_SOCKETS
-		#define GDISP_GFXNET_UNSAFE_SOCKETS	TRUE
+		#define GDISP_GFXNET_UNSAFE_SOCKETS	GFXON
 	#endif
 #endif
 
@@ -336,12 +336,12 @@ int main(proto_args) {
 	font = gdispOpenFont("UI2");
 
 	// Open the connection
-	gdispDrawStringBox(0, 0, gdispGetWidth(), gdispGetHeight(), "Connecting to host...", font, White, justifyCenter);
+	gdispDrawStringBox(0, 0, gdispGetWidth(), gdispGetHeight(), "Connecting to host...", font, GFX_WHITE, justifyCenter);
 	StartSockets();
 	netfd = doConnect(cmd_args);
 	if (netfd == (SOCKET_TYPE)-1)
 		gfxHalt("Could not connect to the specified server");
-	gdispClear(Black);
+	gdispClear(GFX_BLACK);
 
 	// Get the initial packet from the host
 	if (!getpkt(cmd, 2)) goto alldone;
@@ -395,7 +395,7 @@ int main(proto_args) {
 		#if GDISP_NEED_SCROLL
 			case GNETCODE_SCROLL:
 				if (!getpkt(cmd, 5)) goto alldone;				// cmd[] = x, y, cx, cy, lines
-				gdispVerticalScroll(cmd[0], cmd[1], cmd[2], cmd[3], cmd[4], Black);
+				gdispVerticalScroll(cmd[0], cmd[1], cmd[2], cmd[3], cmd[4], GFX_BLACK);
 				break;
 		#endif
 		case GNETCODE_CONTROL: