First set of V3 macro changes

7 files changed, 87 insertions, 88 deletions

diff --git a/demos/games/justget10/demo.mk b/demos/games/justget10/demo.mk
index 1487808b..9e58121c 100644
--- a/demos/games/justget10/demo.mk
+++ b/demos/games/justget10/demo.mk
@@ -6,4 +6,4 @@ GFXINC +=   $(DEMODIR) \
 GFXSRC +=	$(DEMODIR)/main.c \
 			$(DEMODIR)/jg10.c
 			
-DEFS += -DJG10_SHOW_SPLASH=TRUE
+DEFS += -DJG10_SHOW_SPLASH=GFXON
diff --git a/demos/games/justget10/gfxconf.h b/demos/games/justget10/gfxconf.h
index 9cfb3859..834b4a9d 100644
--- a/demos/games/justget10/gfxconf.h
+++ b/demos/games/justget10/gfxconf.h
@@ -31,65 +31,65 @@
 #define _GFXCONF_H
 
 /* 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
 
-#define GFX_USE_GFILE                           TRUE
-#define GFILE_NEED_ROMFS                        TRUE
+#define GFX_USE_GFILE                           GFXON
+#define GFILE_NEED_ROMFS                        GFXON
 #define GFILE_MAX_GFILES                         24
 
 /* Features for the GDISP sub-system. */
-#define GDISP_NEED_CONTROL		                TRUE
-#define GDISP_NEED_VALIDATION		            TRUE
-#define GDISP_NEED_CLIP			                TRUE
-#define GDISP_NEED_TEXT			                TRUE
-#define GDISP_NEED_MULTITHREAD		            TRUE
-#define GDISP_NEED_IMAGE		                TRUE
-#define GDISP_NEED_IMAGE_BMP		            TRUE
-#define GDISP_NEED_CIRCLE		                TRUE
-#define GDISP_NEED_ELLIPSE		                TRUE
-#define GDISP_NEED_ARC			                TRUE
-#define GDISP_NEED_STARTUP_LOGO                 FALSE
+#define GDISP_NEED_CONTROL		                GFXON
+#define GDISP_NEED_VALIDATION		            GFXON
+#define GDISP_NEED_CLIP			                GFXON
+#define GDISP_NEED_TEXT			                GFXON
+#define GDISP_NEED_MULTITHREAD		            GFXON
+#define GDISP_NEED_IMAGE		                GFXON
+#define GDISP_NEED_IMAGE_BMP		            GFXON
+#define GDISP_NEED_CIRCLE		                GFXON
+#define GDISP_NEED_ELLIPSE		                GFXON
+#define GDISP_NEED_ARC			                GFXON
+#define GDISP_NEED_STARTUP_LOGO                 GFXOFF
 
 
 //////////////////
-#define GFX_USE_GWIN                            TRUE
+#define GFX_USE_GWIN                            GFXON
 
-#define GWIN_NEED_WINDOWMANAGER                 TRUE
-#define GQUEUE_NEED_ASYNC                       TRUE
-#define GFX_USE_GQUEUE                          TRUE
-#define GWIN_REDRAW_IMMEDIATE                   TRUE
-#define GWIN_REDRAW_SINGLEOP                    TRUE
+#define GWIN_NEED_WINDOWMANAGER                 GFXON
+#define GQUEUE_NEED_ASYNC                       GFXON
+#define GFX_USE_GQUEUE                          GFXON
+#define GWIN_REDRAW_IMMEDIATE                   GFXON
+#define GWIN_REDRAW_SINGLEOP                    GFXON
 
-#define GWIN_NEED_WIDGET                        TRUE
-#define GWIN_NEED_BUTTON                        TRUE
-#define GWIN_BUTTON_LAZY_RELEASE                FALSE
-#define GWIN_NEED_SLIDER                        TRUE
-#define GWIN_FLAT_STYLING                       FALSE
+#define GWIN_NEED_WIDGET                        GFXON
+#define GWIN_NEED_BUTTON                        GFXON
+#define GWIN_BUTTON_LAZY_RELEASE                GFXOFF
+#define GWIN_NEED_SLIDER                        GFXON
+#define GWIN_FLAT_STYLING                       GFXOFF
 
-#define GWIN_NEED_CONTAINERS                    TRUE
-#define GWIN_NEED_CONTAINER                     TRUE
-#define GWIN_NEED_FRAME                         FALSE
-#define GWIN_NEED_TABSET                        FALSE
+#define GWIN_NEED_CONTAINERS                    GFXON
+#define GWIN_NEED_CONTAINER                     GFXON
+#define GWIN_NEED_FRAME                         GFXOFF
+#define GWIN_NEED_TABSET                        GFXOFF
 
 
-#define GWIN_NEED_CONSOLE                            TRUE
-    #define GWIN_CONSOLE_USE_HISTORY                 TRUE
-        #define GWIN_CONSOLE_HISTORY_AVERAGING       TRUE
-        #define GWIN_CONSOLE_HISTORY_ATCREATE        TRUE
-    #define GWIN_CONSOLE_ESCSEQ                      TRUE
-    #define GWIN_CONSOLE_USE_BASESTREAM              TRUE
-#define GWIN_NEED_GRAPH                              TRUE
+#define GWIN_NEED_CONSOLE                            GFXON
+    #define GWIN_CONSOLE_USE_HISTORY                 GFXON
+        #define GWIN_CONSOLE_HISTORY_AVERAGING       GFXON
+        #define GWIN_CONSOLE_HISTORY_ATCREATE        GFXON
+    #define GWIN_CONSOLE_ESCSEQ                      GFXON
+    #define GWIN_CONSOLE_USE_BASESTREAM              GFXON
+#define GWIN_NEED_GRAPH                              GFXON
 
 
 
 /* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16      TRUE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16      GFXON
 
 
 /* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE                       TRUE
+#define GINPUT_NEED_MOUSE                       GFXON
 
 #endif /* _GFXCONF_H */
diff --git a/demos/games/minesweeper/demo.mk b/demos/games/minesweeper/demo.mk
index 43869d7e..41b18106 100644
--- a/demos/games/minesweeper/demo.mk
+++ b/demos/games/minesweeper/demo.mk
@@ -6,4 +6,4 @@ GFXINC +=   $(DEMODIR) \
 GFXSRC +=	$(DEMODIR)/main.c \
 			$(DEMODIR)/mines.c
 			
-DEFS += -DMINES_SHOW_SPLASH=TRUE
+DEFS += -DMINES_SHOW_SPLASH=GFXON
diff --git a/demos/games/minesweeper/gfxconf.h b/demos/games/minesweeper/gfxconf.h
index 468b32e2..c0961839 100644
--- a/demos/games/minesweeper/gfxconf.h
+++ b/demos/games/minesweeper/gfxconf.h
@@ -31,35 +31,34 @@
 #define _GFXCONF_H
 
 /* GFX sub-systems to turn on */
-#define GFX_USE_GDISP			                TRUE
-#define GFX_USE_GWIN			                TRUE
-#define GFX_USE_GEVENT			                TRUE
-#define GFX_USE_GTIMER			                TRUE
-#define GFX_USE_GINPUT			                TRUE
+#define GFX_USE_GDISP			                GFXON
+#define GFX_USE_GWIN			                GFXON
+#define GFX_USE_GEVENT			                GFXON
+#define GFX_USE_GTIMER			                GFXON
+#define GFX_USE_GINPUT			                GFXON
 
-#define GFX_USE_GFILE                           TRUE
-#define GFILE_NEED_ROMFS                        TRUE
+#define GFX_USE_GFILE                           GFXON
+#define GFILE_NEED_ROMFS                        GFXON
 
 /* Features for the GDISP sub-system. */
-#define GDISP_NEED_CONTROL		                TRUE
-#define GDISP_NEED_VALIDATION		            TRUE
-#define GDISP_NEED_CLIP			                TRUE
-#define GDISP_NEED_TEXT			                TRUE
-#define GDISP_NEED_MULTITHREAD		            TRUE
-#define GDISP_NEED_IMAGE		                TRUE
-#define GDISP_NEED_IMAGE_BMP		            TRUE
-#define GDISP_NEED_CIRCLE		                TRUE
-#define GDISP_NEED_ELLIPSE		                TRUE
-#define GDISP_NEED_ARC			                TRUE
-#define GDISP_NEED_STARTUP_LOGO					FALSE
+#define GDISP_NEED_CONTROL		                GFXON
+#define GDISP_NEED_VALIDATION		            GFXON
+#define GDISP_NEED_CLIP			                GFXON
+#define GDISP_NEED_TEXT			                GFXON
+#define GDISP_NEED_MULTITHREAD		            GFXON
+#define GDISP_NEED_IMAGE		                GFXON
+#define GDISP_NEED_IMAGE_BMP		            GFXON
+#define GDISP_NEED_CIRCLE		                GFXON
+#define GDISP_NEED_ELLIPSE		                GFXON
+#define GDISP_NEED_ARC			                GFXON
 
 /* Builtin Fonts */
-#define GDISP_INCLUDE_USER_FONTS                TRUE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16	        TRUE
-#define GDISP_INCLUDE_FONT_FIXED_10X20          TRUE
-#define GDISP_INCLUDE_FONT_FIXED_5X8            TRUE
+#define GDISP_INCLUDE_USER_FONTS                GFXON
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16	        GFXON
+#define GDISP_INCLUDE_FONT_FIXED_10X20          GFXON
+#define GDISP_INCLUDE_FONT_FIXED_5X8            GFXON
 
 /* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE                       TRUE
+#define GINPUT_NEED_MOUSE                       GFXON
 
 #endif /* _GFXCONF_H */
diff --git a/demos/games/minesweeper/readme.txt b/demos/games/minesweeper/readme.txt
index e820fe63..f207da09 100644
--- a/demos/games/minesweeper/readme.txt
+++ b/demos/games/minesweeper/readme.txt
@@ -1,6 +1,6 @@
 A demo Minesweeper game using. Various configuration options can be found in mines.h
 
-NOTE: You can save FLASH space by disabling the splash-screen, to do that set MINES_SHOW_SPLASH to FALSE.
+NOTE: You can save FLASH space by disabling the splash-screen, to do that set MINES_SHOW_SPLASH to GFXOFF.
 
 Credits:
 	Code:	Fleck
diff --git a/demos/games/tetris/Example_Makefiles/stm32f4/Makefile b/demos/games/tetris/Example_Makefiles/stm32f4/Makefile
index b1f8a710..9fa2eca9 100644
--- a/demos/games/tetris/Example_Makefiles/stm32f4/Makefile
+++ b/demos/games/tetris/Example_Makefiles/stm32f4/Makefile
@@ -176,7 +176,7 @@ CPPWARN = -Wall -Wextra
 #
 
 # List all default C defines here, like -D_DEBUG=1
-DDEFS = -DGFX_USE_OS_CHIBIOS=TRUE
+DDEFS = -DGFX_USE_OS_CHIBIOS=GFXON
 
 # List all default ASM defines here, like -D_DEBUG=1
 DADEFS =
diff --git a/demos/games/tetris/gfxconf.h b/demos/games/tetris/gfxconf.h
index 08997b10..72df36c7 100644
--- a/demos/games/tetris/gfxconf.h
+++ b/demos/games/tetris/gfxconf.h
@@ -31,38 +31,38 @@
 #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_USE_DMA			TRUE
-#define GDISP_NEED_CONTROL		TRUE
-#define GDISP_NEED_VALIDATION	TRUE
-#define GDISP_NEED_CLIP			TRUE
-#define GDISP_NEED_TEXT			TRUE
-#define GDISP_NEED_CIRCLE		TRUE
-#define GDISP_NEED_MULTITHREAD	TRUE
+#define GDISP_USE_DMA			GFXON
+#define GDISP_NEED_CONTROL		GFXON
+#define GDISP_NEED_VALIDATION	GFXON
+#define GDISP_NEED_CLIP			GFXON
+#define GDISP_NEED_TEXT			GFXON
+#define GDISP_NEED_CIRCLE		GFXON
+#define GDISP_NEED_MULTITHREAD	GFXON
 
 /* Comment these out if it conflicts with your hardware */
-#define GDISP_NEED_CONTROL		TRUE
+#define GDISP_NEED_CONTROL		GFXON
 #define GDISP_DEFAULT_ORIENTATION    GDISP_ROTATE_PORTRAIT
 #define GDISP_SCREEN_WIDTH      240
 #define GDISP_SCREEN_HEIGHT     320
 
 /* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12		TRUE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16		TRUE
-#define GDISP_NEED_ANTIALIAS				FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12		GFXON
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16		GFXON
+#define GDISP_NEED_ANTIALIAS				GFXOFF
 
 /* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE		TRUE
+#define GINPUT_NEED_MOUSE		GFXON
 
 #endif /* _GFXCONF_H */