From f265924396167729e8d9fb36a0383263f36c1270 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Tue, 27 Feb 2018 17:44:21 +1000
Subject: First set of V3 macro changes

---
 demos/tools/uGFXnetDisplay/gfxconf.h | 32 ++++++++++++++++----------------
 demos/tools/uGFXnetDisplay/main.c    |  8 ++++----
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'demos/tools/uGFXnetDisplay')

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..69703825 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
 
-- 
cgit v1.2.3