3 files changed, 50 insertions, 50 deletions

diff --git a/demos/3rdparty/notepad-2/gfxconf.h b/demos/3rdparty/notepad-2/gfxconf.h
index 869b2ab2..7bbace41 100644
--- a/demos/3rdparty/notepad-2/gfxconf.h
+++ b/demos/3rdparty/notepad-2/gfxconf.h
@@ -10,55 +10,55 @@
 #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_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
 
 /* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION		TRUE
-#define GDISP_NEED_CLIP				TRUE
-#define GDISP_NEED_TEXT				TRUE
-#define GDISP_NEED_CIRCLE			TRUE
-#define GDISP_NEED_ELLIPSE			FALSE
-#define GDISP_NEED_ARC				FALSE
-#define GDISP_NEED_CONVEX_POLYGON	FALSE
-#define GDISP_NEED_SCROLL			FALSE
-#define GDISP_NEED_PIXELREAD		FALSE
-#define GDISP_NEED_CONTROL			TRUE
-#define GDISP_NEED_IMAGE			TRUE
-#define GDISP_NEED_MULTITHREAD		TRUE
-#define GDISP_NEED_ASYNC			FALSE
-#define GDISP_NEED_MSGAPI			FALSE
+#define GDISP_NEED_VALIDATION		GFXON
+#define GDISP_NEED_CLIP				GFXON
+#define GDISP_NEED_TEXT				GFXON
+#define GDISP_NEED_CIRCLE			GFXON
+#define GDISP_NEED_ELLIPSE			GFXOFF
+#define GDISP_NEED_ARC				GFXOFF
+#define GDISP_NEED_CONVEX_POLYGON	GFXOFF
+#define GDISP_NEED_SCROLL			GFXOFF
+#define GDISP_NEED_PIXELREAD		GFXOFF
+#define GDISP_NEED_CONTROL			GFXON
+#define GDISP_NEED_IMAGE			GFXON
+#define GDISP_NEED_MULTITHREAD		GFXON
+#define GDISP_NEED_ASYNC			GFXOFF
+#define GDISP_NEED_MSGAPI			GFXOFF
 
 /* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_SMALL		FALSE
-#define GDISP_INCLUDE_FONT_LARGER		FALSE
-#define GDISP_INCLUDE_FONT_UI1			FALSE
-#define GDISP_INCLUDE_FONT_UI2			TRUE
-#define GDISP_INCLUDE_FONT_LARGENUMBERS	FALSE
+#define GDISP_INCLUDE_FONT_SMALL		GFXOFF
+#define GDISP_INCLUDE_FONT_LARGER		GFXOFF
+#define GDISP_INCLUDE_FONT_UI1			GFXOFF
+#define GDISP_INCLUDE_FONT_UI2			GFXON
+#define GDISP_INCLUDE_FONT_LARGENUMBERS	GFXOFF
 
 /* GDISP image decoders */
-#define GDISP_NEED_IMAGE_NATIVE		FALSE
-#define GDISP_NEED_IMAGE_GIF		TRUE
-#define GDISP_NEED_IMAGE_BMP		FALSE
-#define GDISP_NEED_IMAGE_JPG		FALSE
-#define GDISP_NEED_IMAGE_PNG		FALSE
+#define GDISP_NEED_IMAGE_NATIVE		GFXOFF
+#define GDISP_NEED_IMAGE_GIF		GFXON
+#define GDISP_NEED_IMAGE_BMP		GFXOFF
+#define GDISP_NEED_IMAGE_JPG		GFXOFF
+#define GDISP_NEED_IMAGE_PNG		GFXOFF
 
 /* Features for the GWIN sub-system. */
-#define GWIN_NEED_BUTTON		TRUE
-#define GWIN_NEED_CONSOLE		TRUE
-#define GWIN_NEED_SLIDER		TRUE
+#define GWIN_NEED_BUTTON		GFXON
+#define GWIN_NEED_CONSOLE		GFXON
+#define GWIN_NEED_SLIDER		GFXON
 
 /* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE		TRUE
-#define GINPUT_NEED_DIAL		FALSE
+#define GINPUT_NEED_MOUSE		GFXON
+#define GINPUT_NEED_DIAL		GFXOFF
 
 #endif /* _GFXCONF_H */
diff --git a/demos/3rdparty/notepad-2/main.c b/demos/3rdparty/notepad-2/main.c
index e4649146..05481b18 100644
--- a/demos/3rdparty/notepad-2/main.c
+++ b/demos/3rdparty/notepad-2/main.c
@@ -38,7 +38,7 @@
 
 const NColorScheme schemeDefault = {
   .titleBarColor = HTML2COLOR(0x3064D8),
-  .titleTextColor = White,
+  .titleTextColor = GFX_WHITE,
 
   .winBgColor = HTML2COLOR(0xFFECB0),
   .drawingWinBorder = HTML2COLOR(0xCEBA77),
@@ -53,7 +53,7 @@ const NColorScheme schemeDefault = {
 
 const NColorScheme schemeDefault2 = {
   .titleBarColor = HTML2COLOR(0x3064D8),
-  .titleTextColor = White,
+  .titleTextColor = GFX_WHITE,
 
   .winBgColor = HTML2COLOR(0xC8D8F8),
   .drawingWinBorder = HTML2COLOR(0x8098E0),
@@ -91,9 +91,9 @@ int main(void) {
 	gfxThreadWait(nLaunchNotepadApp());
 
 	gdispSetClip(0, 0, gdispGetWidth(), gdispGetHeight());
-	gdispClear(Black);
-	gdispDrawString(3, 3, "Notepad Terminated.", font, White);
-	gdispDrawString(3, 20, "Relaunching Notepad App...", font, White);
+	gdispClear(GFX_BLACK);
+	gdispDrawString(3, 3, "Notepad Terminated.", font, GFX_WHITE);
+	gdispDrawString(3, 20, "Relaunching Notepad App...", font, GFX_WHITE);
 
 	gfxSleepMilliseconds(1000);
   }
diff --git a/demos/3rdparty/notepad-2/notepadApp.c b/demos/3rdparty/notepad-2/notepadApp.c
index 83186d38..9f61aaa4 100644
--- a/demos/3rdparty/notepad-2/notepadApp.c
+++ b/demos/3rdparty/notepad-2/notepadApp.c
@@ -63,9 +63,9 @@ static GButtonObject btnClose;
 // Image object
 static gdispImage toolbarImageFilmstrip;
 
-static color_t myColors[] = { Black, Red, Green, Blue, Cyan, Magenta, Yellow, White };
+static color_t myColors[] = { GFX_BLACK, GFX_RED, GFX_GREEN, GFX_BLUE, GFX_CYAN, GFX_MAGENTA, GFX_YELLOW, GFX_WHITE };
 
-static color_t selColor = Black;
+static color_t selColor = GFX_BLACK;
 static int selColorIndex = 0, selPenWidth = 1, tbMode = 1;
 
 static NColorScheme nCurColorScheme;
@@ -383,13 +383,13 @@ static DECLARE_THREAD_FUNCTION(notepadThread, param) {
                  0);
 
   gwinSetBgColor(ghc, nCurColorScheme.winBgColor);
-  gwinSetColor(ghc, Black);
+  gwinSetColor(ghc, GFX_BLACK);
 
   gstatusConsole = ghc;
 
   /* draw the buttons */
-  gwinSetColor(nDrawingArea, Black);
-  gwinSetBgColor(nDrawingArea, White);
+  gwinSetColor(nDrawingArea, GFX_BLACK);
+  gwinSetBgColor(nDrawingArea, GFX_WHITE);
 
   gwinClear(nDrawingArea);
   gwinClear(ghc);
@@ -414,8 +414,8 @@ static DECLARE_THREAD_FUNCTION(notepadThread, param) {
 		  selPenWidth = 0;
 		  ncoreSetMode(NCORE_MODE_DRAW);
 
-		  gwinSetColor(nDrawingArea, Black);
-		  gwinSetBgColor(nDrawingArea, White);
+		  gwinSetColor(nDrawingArea, GFX_BLACK);
+		  gwinSetBgColor(nDrawingArea, GFX_WHITE);
 
 		  // Refresh the buttons
 		  drawButtons();