Added new type definitions - moving towards V3.0

40 files changed, 218 insertions, 218 deletions

diff --git a/demos/modules/gadc/gwinosc.c b/demos/modules/gadc/gwinosc.c
index f29107bc..e82cd7d8 100644
--- a/demos/modules/gadc/gwinosc.c
+++ b/demos/modules/gadc/gwinosc.c
@@ -89,10 +89,10 @@ void gwinScopeWaitForTrace(GHandle gh) {
 	GDataBuffer		*pd;
 	uint8_t			shr;
 #if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
-	bool_t			rdytrigger;
+	gBool			rdytrigger;
 	int				flsamples;
 #elif TRIGGER_METHOD == TRIGGER_MINVALUE
-	bool_t			rdytrigger;
+	gBool			rdytrigger;
 	int				flsamples;
 	coord_t			scopemin;
 #endif
@@ -116,10 +116,10 @@ void gwinScopeWaitForTrace(GHandle gh) {
 	pc = gs->lastscopetrace+x;
 	pa = (adcsample_t *)(pd+1);
 #if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
-	rdytrigger = FALSE;
+	rdytrigger = gFalse;
 	flsamples = 0;
 #elif TRIGGER_METHOD == TRIGGER_MINVALUE
-	rdytrigger = FALSE;
+	rdytrigger = gFalse;
 	flsamples = 0;
 	scopemin = 0;
 #endif
@@ -144,7 +144,7 @@ void gwinScopeWaitForTrace(GHandle gh) {
 			#if TRIGGER_METHOD == TRIGGER_MINVALUE
 				/* Arm when we reach the sample minimum (y value maximum) of the previous trace */
 				if (!rdytrigger && y >= gs->scopemin)
-					rdytrigger = TRUE;
+					rdytrigger = gTrue;
 			#endif
 
 			if (y == gs->lasty) {
@@ -157,7 +157,7 @@ void gwinScopeWaitForTrace(GHandle gh) {
 				flsamples = 0;
 				#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
 					/* Arm the trigger when samples fall (y increases) ie. negative slope */
-					rdytrigger = TRUE;
+					rdytrigger = gTrue;
 				#endif
 				continue;
 			} else {
@@ -169,7 +169,7 @@ void gwinScopeWaitForTrace(GHandle gh) {
 			}
 
 			/* Ready for a the next trigger cycle */
-			rdytrigger = FALSE;
+			rdytrigger = gFalse;
 #endif
 
 			/* Prepare for a scope trace */
diff --git a/demos/modules/gadc/main.c b/demos/modules/gadc/main.c
index ee54a118..5d07f8eb 100644
--- a/demos/modules/gadc/main.c
+++ b/demos/modules/gadc/main.c
@@ -154,7 +154,7 @@ int main(void) {
 			GWindowInit	wi;
 
 			gwinClearInit(&wi);
-			wi.show = TRUE;
+			wi.show = gTrue;
 			wi.x = wi.y = 0;
 			wi.width = swidth-SCOPE_CX;
 			wi.height = sheight;
@@ -166,7 +166,7 @@ int main(void) {
 
 		/* Start our timer for reading the dial */
 		gtimerInit(&lsTimer);
-		gtimerStart(&lsTimer, LowSpeedTimer, ghText, TRUE, MY_LS_DELAY);
+		gtimerStart(&lsTimer, LowSpeedTimer, ghText, gTrue, MY_LS_DELAY);
 	#endif
 
 	/**
@@ -188,7 +188,7 @@ int main(void) {
 		GWindowInit	wi;
 
 		gwinClearInit(&wi);
-		wi.show = TRUE;
+		wi.show = gTrue;
 		wi.x = swidth-SCOPE_CX;
 		wi.y = 0;
 		wi.width = SCOPE_CX;
@@ -200,7 +200,7 @@ int main(void) {
 	gwinClear(ghScope);
 
 	/* Just keep displaying the scope traces */
-	while (TRUE) {
+	while (1) {
 		/**
 		 * The function below internally performs a wait thus giving the timer thread a
 		 * chance to run.
diff --git a/demos/modules/gaudio/oscilloscope/gwinosc.c b/demos/modules/gaudio/oscilloscope/gwinosc.c
index fcad648f..38edb35e 100644
--- a/demos/modules/gaudio/oscilloscope/gwinosc.c
+++ b/demos/modules/gaudio/oscilloscope/gwinosc.c
@@ -106,10 +106,10 @@ void gwinScopeWaitForTrace(GHandle gh) {
 	uint8_t			shr;
 
 	#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
-		bool_t			rdytrigger;
+		gBool			rdytrigger;
 		int				flsamples;
 	#elif TRIGGER_METHOD == TRIGGER_MINVALUE
-		bool_t			rdytrigger;
+		gBool			rdytrigger;
 		int				flsamples;
 		coord_t			scopemin;
 	#endif
@@ -136,10 +136,10 @@ void gwinScopeWaitForTrace(GHandle gh) {
 	pa16 = (uint16_t *)(paud+1);
 
 	#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
-		rdytrigger = FALSE;
+		rdytrigger = gFalse;
 		flsamples = 0;
 	#elif TRIGGER_METHOD == TRIGGER_MINVALUE
-		rdytrigger = FALSE;
+		rdytrigger = gFalse;
 		flsamples = 0;
 		scopemin = 0;
 	#endif
@@ -167,7 +167,7 @@ void gwinScopeWaitForTrace(GHandle gh) {
 				#if TRIGGER_METHOD == TRIGGER_MINVALUE
 					/* Arm when we reach the sample minimum (y value maximum) of the previous trace */
 					if (!rdytrigger && y >= gs->scopemin)
-						rdytrigger = TRUE;
+						rdytrigger = gTrue;
 				#endif
 
 				if (y == gs->lasty) {
@@ -180,7 +180,7 @@ void gwinScopeWaitForTrace(GHandle gh) {
 					flsamples = 0;
 					#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
 						/* Arm the trigger when samples fall (y increases) ie. negative slope */
-						rdytrigger = TRUE;
+						rdytrigger = gTrue;
 					#endif
 					continue;
 				} else {
@@ -192,7 +192,7 @@ void gwinScopeWaitForTrace(GHandle gh) {
 				}
 
 				/* Ready for a the next trigger cycle */
-				rdytrigger = FALSE;
+				rdytrigger = gFalse;
 			#endif
 
 			/* Prepare for a scope trace */
diff --git a/demos/modules/gaudio/oscilloscope/main.c b/demos/modules/gaudio/oscilloscope/main.c
index 335b2cee..cd62e1f1 100644
--- a/demos/modules/gaudio/oscilloscope/main.c
+++ b/demos/modules/gaudio/oscilloscope/main.c
@@ -74,7 +74,7 @@ int main(void) {
 		GWindowInit	wi;
 
 		gwinClearInit(&wi);
-		wi.show = TRUE;
+		wi.show = gTrue;
 		wi.x = wi.y = 0;
 		wi.width = swidth; wi.height = sheight;
 		ghScope = gwinScopeCreate(&gScopeWindow, &wi, MY_AUDIO_CHANNEL, MY_AUDIO_FREQUENCY, MY_AUDIO_FORMAT);
@@ -84,7 +84,7 @@ int main(void) {
 	gwinClear(ghScope);
 
 	/* Just keep displaying the scope traces */
-	while (TRUE) {
+	while (1) {
 		gwinScopeWaitForTrace(ghScope);
 	}
 }
diff --git a/demos/modules/gaudio/play-vs1053/main.c b/demos/modules/gaudio/play-vs1053/main.c
index 66ac5f8d..21e28c98 100644
--- a/demos/modules/gaudio/play-vs1053/main.c
+++ b/demos/modules/gaudio/play-vs1053/main.c
@@ -114,6 +114,6 @@ theend:
 	if (errmsg)
 		gdispDrawString(0, gdispGetHeight()/2, errmsg, font, GFX_RED);
 
-	while(TRUE)
+	while(1)
 		gfxSleepMilliseconds(1000);
 }
diff --git a/demos/modules/gaudio/play-wave/main.c b/demos/modules/gaudio/play-wave/main.c
index af3df7d1..4c863fcf 100644
--- a/demos/modules/gaudio/play-wave/main.c
+++ b/demos/modules/gaudio/play-wave/main.c
@@ -139,7 +139,7 @@ repeatplay:
 	len += 20;
 
 	// Read RIFF blocks until we get to the data RIFF block (contains the audio)
-	while(TRUE) {
+	while(1) {
 		if (gfileRead(f, whdr, 8) != 8) {
 			errmsg = "Err: Read block";
 			goto theend;
@@ -196,6 +196,6 @@ theend:
 	if (errmsg)
 		gdispDrawString(0, gdispGetHeight()/2, errmsg, font, GFX_RED);
 
-	while(TRUE)
+	while(1)
 		gfxSleepMilliseconds(1000);
 }
diff --git a/demos/modules/gdisp/basics/main.c b/demos/modules/gdisp/basics/main.c
index ccf98d22..9517e0a6 100644
--- a/demos/modules/gdisp/basics/main.c
+++ b/demos/modules/gdisp/basics/main.c
@@ -48,7 +48,7 @@ int main(void) {
 	for(i = 5, j = 0; i < width && j < height; i += 7, j += i/20)

     	gdispDrawPixel(i, j, GFX_WHITE);

 

-    while(TRUE) {

+    while(1) {

     	gfxSleepMilliseconds(500);

     }   

 }

diff --git a/demos/modules/gdisp/circles/main.c b/demos/modules/gdisp/circles/main.c
index 4efb896a..e631da1a 100644
--- a/demos/modules/gdisp/circles/main.c
+++ b/demos/modules/gdisp/circles/main.c
@@ -47,7 +47,7 @@ int main(void) {
 	gdispFillEllipse (width-width/6, height-height/6, width/8, height/16, GFX_BLUE);

 	gdispDrawEllipse (width-width/6, height-height/6, width/16, height/8, GFX_YELLOW);

 

-    while(TRUE) {

+    while(1) {

     	gfxSleepMilliseconds(500);

     }   

 }

diff --git a/demos/modules/gdisp/fonts/main.c b/demos/modules/gdisp/fonts/main.c
index 73d7c54e..a0d888dc 100644
--- a/demos/modules/gdisp/fonts/main.c
+++ b/demos/modules/gdisp/fonts/main.c
@@ -88,7 +88,7 @@ int main(void) {
 	gdispFillStringBox(0, y, width,  fheight1, buf, font1, GFX_RED, GFX_WHITE, justifyCenter);
 	
 	// Wait forever
-    while(TRUE) {
+    while(1) {
     	gfxSleepMilliseconds(500);
     }   
 }
diff --git a/demos/modules/gdisp/fonts_cyrillic/main.c b/demos/modules/gdisp/fonts_cyrillic/main.c
index b65801a1..1f6a30a9 100644
--- a/demos/modules/gdisp/fonts_cyrillic/main.c
+++ b/demos/modules/gdisp/fonts_cyrillic/main.c
@@ -42,7 +42,7 @@ int main(void) {
 	gdispDrawString(10, 10, "привет мир", font1, GFX_YELLOW);

 

 	// Wait forever

-    while(TRUE) {

+    while(1) {

     	gfxSleepMilliseconds(500);

     }   

 }

diff --git a/demos/modules/gdisp/multiple_displays/main.c b/demos/modules/gdisp/multiple_displays/main.c
index 8b38a22a..ea05507b 100644
--- a/demos/modules/gdisp/multiple_displays/main.c
+++ b/demos/modules/gdisp/multiple_displays/main.c
@@ -83,7 +83,7 @@
 				gdispGDrawPixel(g, i, j, GFX_WHITE);
 		}
 
-		while(TRUE) {
+		while(1) {
 			gfxSleepMilliseconds(500);
 		}
 	}
@@ -126,7 +126,7 @@
 				gdispDrawPixel(i, j, GFX_WHITE);
 		}
 
-		while(TRUE) {
+		while(1) {
 			gfxSleepMilliseconds(500);
 		}
 	}
diff --git a/demos/modules/gdisp/pixmap/main.c b/demos/modules/gdisp/pixmap/main.c
index a6791ec9..975611c8 100644
--- a/demos/modules/gdisp/pixmap/main.c
+++ b/demos/modules/gdisp/pixmap/main.c
@@ -62,7 +62,7 @@ int main(void) {
     gdispGDrawLine(pixmap, 0, 0, gdispGGetWidth(pixmap)-1, gdispGGetHeight(pixmap)-1, GFX_WHITE);
     
     i = j = 0;
-    while(TRUE) {
+    while(1) {
     	// Clear the old position
     	gdispFillArea(i, j, PIXMAP_WIDTH, PIXMAP_HEIGHT, GFX_BLACK);
 
diff --git a/demos/modules/gdisp/polygons/main.c b/demos/modules/gdisp/polygons/main.c
index 8a4f7df3..277fd0bf 100644
--- a/demos/modules/gdisp/polygons/main.c
+++ b/demos/modules/gdisp/polygons/main.c
@@ -103,7 +103,7 @@ int main(void) {
     transmaxy = INT2MTYPE(height - 15);
     transminy = INT2MTYPE(15);
 
-    while(TRUE) {
+    while(1) {
 
     	// Move to the new location, rotation and scale
 		scalex += scaleincx;
diff --git a/demos/modules/gdisp/thickarcs/main.c b/demos/modules/gdisp/thickarcs/main.c
index adf42810..c190d43c 100644
--- a/demos/modules/gdisp/thickarcs/main.c
+++ b/demos/modules/gdisp/thickarcs/main.c
@@ -43,7 +43,7 @@ int main(void)
     // Initialize the uGFX library
     gfxInit();
 
-	while(TRUE) {
+	while(1) {
 		// Clear the entire screen
 		gdispClear(GFX_BLACK);
 
diff --git a/demos/modules/ginput/keyboard/main.c b/demos/modules/ginput/keyboard/main.c
index dec93125..e521207f 100644
--- a/demos/modules/ginput/keyboard/main.c
+++ b/demos/modules/ginput/keyboard/main.c
@@ -54,7 +54,7 @@ int main(void) {
 		GWindowInit		wi;
 
 		gwinClearInit(&wi);
-		wi.show = TRUE;
+		wi.show = gTrue;
 		wi.x = 0; wi.y = 0; wi.width = gdispGetWidth(); wi.height = gdispGetHeight();
 		GW = gwinConsoleCreate(0, &wi);
 
diff --git a/demos/modules/gos/threads/main.c b/demos/modules/gos/threads/main.c
index 97b1c7e4..56ea4bb9 100644
--- a/demos/modules/gos/threads/main.c
+++ b/demos/modules/gos/threads/main.c
@@ -26,7 +26,7 @@ threadreturn_t heartbeat1(void* param)
 {
     (void)param;
 
-    while (TRUE) {
+    while (1) {
     	DEBUGWRITE("thread 1\n");
         gfxSleepMilliseconds(500);
     }
@@ -38,7 +38,7 @@ threadreturn_t heartbeat2(void* param)
 {
     (void)param;
 
-    while (TRUE) {
+    while (1) {
     	DEBUGWRITE("thread 2\n");
         gfxSleepMilliseconds(900);
     }
@@ -54,7 +54,7 @@ int main(void)
     gfxThreadCreate(0, 2048, NORMAL_PRIORITY, heartbeat1, 0);
     gfxThreadCreate(0, 2048, NORMAL_PRIORITY, heartbeat2, 0);
 
-    while (TRUE) {
+    while (1) {
     	DEBUGWRITE("thread main\n");
         gfxSleepMilliseconds(1400);
     }
diff --git a/demos/modules/gos/threads_advanced/main.c b/demos/modules/gos/threads_advanced/main.c
index 89cada9f..8527194e 100644
--- a/demos/modules/gos/threads_advanced/main.c
+++ b/demos/modules/gos/threads_advanced/main.c
@@ -65,11 +65,11 @@ gfxThreadHandle		thd;
  */
 threadreturn_t Thread_function(void* param)
 {	
-	/* Cast the paramter into a bool pointer so we can use it */
-	bool_t* doExit = (bool_t*)param;
+	/* Cast the paramter into a gBool pointer so we can use it */
+	gBool* doExit = (gBool*)param;
 
 	/* Execute this until we shall be terminated */
-	while (*doExit == FALSE) {
+	while (!*doExit) {
 		DEBUGWRITE("Message from Thread\n");
 		gfxSleepMilliseconds(500);
 	}
@@ -84,12 +84,12 @@ threadreturn_t Thread_function(void* param)
  */
 void timerCallback(void* param)
 {
-	/* Cast the paramter into a bool pointer so we can use it */
-	bool_t* threadExit = (bool_t*)param;
+	/* Cast the paramter into a gBool pointer so we can use it */
+	gBool* threadExit = (gBool*)param;
 	
 	/* Ask the Thread to fall over the end */
 	DEBUGWRITE("Closing thread!\n");
-	*threadExit = TRUE;
+	*threadExit = gTrue;
 }
 
 /*
@@ -97,7 +97,7 @@ void timerCallback(void* param)
  */
 int main(void)
 {
-	bool_t exitThread = FALSE;
+	gBool exitThread = gFalse;
 
 	gfxInit();
 
@@ -112,9 +112,9 @@ int main(void)
 	/* Start the timer. The callback function will be called once after 2000ms
 	 * We will pass the thread handle as a parameter so the timer can ask the thread to terminate
 	 */
-	gtimerStart(&gt, timerCallback, (void*)&exitThread, FALSE, 2000);
+	gtimerStart(&gt, timerCallback, (void*)&exitThread, gFalse, 2000);
 
-	while(TRUE) {
+	while(1) {
 		DEBUGWRITE("Message from main!\n");
 		gfxSleepMilliseconds(500);
 	}   
diff --git a/demos/modules/gtimer/main.c b/demos/modules/gtimer/main.c
index 89a6bab7..7612772c 100644
--- a/demos/modules/gtimer/main.c
+++ b/demos/modules/gtimer/main.c
@@ -51,12 +51,12 @@ int main(void) {
     gtimerInit(&GT2);

  

     /* continious mode - callback1() called without any argument every 250ms */

-    gtimerStart(&GT1, callback1, 0, TRUE, 250);

+    gtimerStart(&GT1, callback1, 0, gTrue, 250);

  

     /* single shot mode - callback2() called without any argument once after 1s */

-    gtimerStart(&GT2, callback2, 0, FALSE, 1000);

+    gtimerStart(&GT2, callback2, 0, gFalse, 1000);

 

-	while(TRUE) {

+	while(1) {

 		gfxSleepMilliseconds(500);

 	}

 

diff --git a/demos/modules/gtrans/basic/main.c b/demos/modules/gtrans/basic/main.c
index 77430a46..da42aa46 100644
--- a/demos/modules/gtrans/basic/main.c
+++ b/demos/modules/gtrans/basic/main.c
@@ -91,7 +91,7 @@ int main(void)
     gtransSetBaseLanguage(&EnglishTranslation);
 
     // Loop through the languages
-    while (TRUE) {
+    while (1) {
         // English
         gtransSetLanguage(&EnglishTranslation);
         updateText();
diff --git a/demos/modules/gwin/basic/main.c b/demos/modules/gwin/basic/main.c
index e5b66f17..901f9e6d 100644
--- a/demos/modules/gwin/basic/main.c
+++ b/demos/modules/gwin/basic/main.c
@@ -44,9 +44,9 @@ int main(void) {
     	GWindowInit	wi;
 
 		gwinClearInit(&wi);
-    	wi.show = TRUE; wi.x = 20; wi.y = 10; wi.width = 200; wi.height = 150;
+    	wi.show = gTrue; wi.x = 20; wi.y = 10; wi.width = 200; wi.height = 150;
         GW1 = gwinWindowCreate(0, &wi);
-    	wi.show = TRUE; wi.x = 50; wi.y = 190; wi.width = 150; wi.height = 100;
+    	wi.show = gTrue; wi.x = 50; wi.y = 190; wi.width = 150; wi.height = 100;
         GW2 = gwinWindowCreate(0, &wi);
     }
 
@@ -72,7 +72,7 @@ int main(void) {
     gwinFillCircle(GW1, 20, 20, 15);
     gwinFillCircle(GW2, 20, 20, 15);
 
-    while(TRUE) {
+    while(1) {
     	gfxSleepMilliseconds(500);
     }   
 }
diff --git a/demos/modules/gwin/button/main.c b/demos/modules/gwin/button/main.c
index 29a5641f..6e766e74 100644
--- a/demos/modules/gwin/button/main.c
+++ b/demos/modules/gwin/button/main.c
@@ -37,7 +37,7 @@ static void createWidgets(void) {
 
 	// Apply some default values for GWIN
 	gwinWidgetClearInit(&wi);
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 
 	// Apply the button parameters
 	wi.g.width = 100;
@@ -64,7 +64,7 @@ int main(void) {
 
 	// Set the widget defaults
 	gwinSetDefaultFont(gdispOpenFont("UI2"));
-	gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+	gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
 	gdispClear(GFX_WHITE);
 
 	// create the widget
@@ -90,7 +90,7 @@ int main(void) {
 					// corner which should translate safely into any orientation.
 					gdispSetOrientation(orients[which]);
 					gdispClear(GFX_WHITE);
-					gwinRedrawDisplay(GDISP, FALSE);
+					gwinRedrawDisplay(GDISP, gFalse);
 				}
 				break;
 
diff --git a/demos/modules/gwin/checkbox/main.c b/demos/modules/gwin/checkbox/main.c
index 00f3ebdb..486c4057 100644
--- a/demos/modules/gwin/checkbox/main.c
+++ b/demos/modules/gwin/checkbox/main.c
@@ -37,7 +37,7 @@ static void createWidgets(void) {
 
 	// Apply some default values for GWIN
 	gwinWidgetClearInit(&wi);
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 
 	// Apply the checkbox parameters
 	wi.g.width = 100;		// includes text
@@ -58,7 +58,7 @@ int main(void) {
 
 	// Set the widget defaults
 	gwinSetDefaultFont(gdispOpenFont("UI2"));
-	gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+	gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
 	gdispClear(GFX_WHITE);
 
 	// create the widget
diff --git a/demos/modules/gwin/console/main.c b/demos/modules/gwin/console/main.c
index 248aeedf..53b80fcb 100644
--- a/demos/modules/gwin/console/main.c
+++ b/demos/modules/gwin/console/main.c
@@ -49,7 +49,7 @@ int main(void) {
 		GWindowInit		wi;
 
 		gwinClearInit(&wi);
-		wi.show = TRUE;
+		wi.show = gTrue;
 		wi.x = 0; wi.y = 0; wi.width = gdispGetWidth(); wi.height = gdispGetHeight()/2;
 		GW1 = gwinConsoleCreate(0, &wi);
 		wi.y = gdispGetHeight()/2; wi.width = gdispGetWidth()/2; wi.height = gdispGetHeight();
@@ -92,13 +92,13 @@ int main(void) {
 
 	/* Make console 3 invisible and then visible again to demonstrate the history buffer */
 	gwinPrintf(GW2, "Making red window \033uinvisible\033U\n");
-	gwinSetVisible(GW3, FALSE);
+	gwinSetVisible(GW3, gFalse);
 	gfxSleepMilliseconds(1000);
 	gwinPrintf(GW2, "Making red window \033uvisible\033U\n");
-	gwinSetVisible(GW3, TRUE);
+	gwinSetVisible(GW3, gTrue);
 	gwinPrintf(GW3, "\033bI'm back!!!\033B\n", i+1);
 
-	while(TRUE) {
+	while(1) {
 		gfxSleepMilliseconds(500);
 	}
 }
diff --git a/demos/modules/gwin/container/main.c b/demos/modules/gwin/container/main.c
index af2e8b1f..d43eca93 100644
--- a/demos/modules/gwin/container/main.c
+++ b/demos/modules/gwin/container/main.c
@@ -10,14 +10,14 @@ static void createWidgets(void) {
     gwinWidgetClearInit(&wi);
 
     // Apply the container parameters
-    wi.g.show = FALSE;
+    wi.g.show = gFalse;
     wi.g.width = 200;
     wi.g.height = 150;
     wi.g.y = 10;
     wi.g.x = 10;
     wi.text = "Container";
     ghContainer = gwinContainerCreate(0, &wi, GWIN_CONTAINER_BORDER);
-    wi.g.show = TRUE;
+    wi.g.show = gTrue;
 
     // Apply the button parameters
     wi.g.width = 120;
@@ -39,7 +39,7 @@ int main(void) {
 
     // Set the widget defaults
     gwinSetDefaultFont(gdispOpenFont("*"));
-    gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+    gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
     gdispClear(GFX_WHITE);
 
     // Create the widget
diff --git a/demos/modules/gwin/container_nested/main.c b/demos/modules/gwin/container_nested/main.c
index 0e5a2634..6d86704e 100644
--- a/demos/modules/gwin/container_nested/main.c
+++ b/demos/modules/gwin/container_nested/main.c
@@ -10,7 +10,7 @@ static void createWidgets(void) {
 
     // Apply some default values for GWIN
     gwinWidgetClearInit(&wi);
-    wi.g.show = FALSE;
+    wi.g.show = gFalse;
 
     // Container 1
     wi.g.width = 300;
@@ -20,7 +20,7 @@ static void createWidgets(void) {
     wi.text = "Container 1";
     ghContainer1 = gwinContainerCreate(0, &wi, GWIN_CONTAINER_BORDER);
 
-    wi.g.show = TRUE;
+    wi.g.show = gTrue;
 
     // Container 2
     wi.g.width = 100;
@@ -117,7 +117,7 @@ int main(void) {
 
     // Set the widget defaults
     gwinSetDefaultFont(gdispOpenFont("*"));
-    gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+    gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
     gdispClear(GFX_WHITE);
 
     // Create the widget
@@ -128,9 +128,9 @@ int main(void) {
     gwinAttachListener(&gl);
 
     // Set the initial state of the checkboxes
-    gwinCheckboxCheck(ghCheckbox1, TRUE);
-    gwinCheckboxCheck(ghCheckbox2, TRUE);
-    gwinCheckboxCheck(ghCheckbox3, TRUE);
+    gwinCheckboxCheck(ghCheckbox1, gTrue);
+    gwinCheckboxCheck(ghCheckbox2, gTrue);
+    gwinCheckboxCheck(ghCheckbox3, gTrue);
 
     while(1) {
         // Get an Event
diff --git a/demos/modules/gwin/frame/main.c b/demos/modules/gwin/frame/main.c
index aae4cfac..3ee330df 100644
--- a/demos/modules/gwin/frame/main.c
+++ b/demos/modules/gwin/frame/main.c
@@ -23,7 +23,7 @@ static void _createWidgets(void) {
 
     // Apply some default values for GWIN
     gwinWidgetClearInit(&wi);
-    wi.g.show = TRUE;
+    wi.g.show = gTrue;
 
     // Create a surprise label behind the frame window
     wi.g.width = 100;
@@ -119,7 +119,7 @@ int main(void) {
 
     // Set the widget defaults
     gwinSetDefaultFont(gdispOpenFont("*"));
-    gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+    gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
     gdispClear(GFX_WHITE);
 
     // create the widget
diff --git a/demos/modules/gwin/gl3d-gears/main.c b/demos/modules/gwin/gl3d-gears/main.c
index 2b450799..882b4253 100644
--- a/demos/modules/gwin/gl3d-gears/main.c
+++ b/demos/modules/gwin/gl3d-gears/main.c
@@ -270,7 +270,7 @@ int main(void) {
     	GWindowInit	wi;
 
 		gwinClearInit(&wi);
-    	wi.show = TRUE; wi.x = (gdispGetWidth()-GL3D_WINDOW_SIZE)/2; wi.y = (gdispGetHeight()-GL3D_WINDOW_SIZE)/2; wi.width = GL3D_WINDOW_SIZE; wi.height = GL3D_WINDOW_SIZE;
+    	wi.show = gTrue; wi.x = (gdispGetWidth()-GL3D_WINDOW_SIZE)/2; wi.y = (gdispGetHeight()-GL3D_WINDOW_SIZE)/2; wi.width = GL3D_WINDOW_SIZE; wi.height = GL3D_WINDOW_SIZE;
         gh = gwinGL3DCreate(0, &wi);
     }
 
@@ -278,7 +278,7 @@ int main(void) {
     setup();
     init();
 
-    while(TRUE) {
+    while(1) {
 
     	// rate control
     	gfxSleepMilliseconds(FRAME_DELAY);
diff --git a/demos/modules/gwin/gl3d-spin/main.c b/demos/modules/gwin/gl3d-spin/main.c
index 4da6b053..0f4b397c 100644
--- a/demos/modules/gwin/gl3d-spin/main.c
+++ b/demos/modules/gwin/gl3d-spin/main.c
@@ -141,7 +141,7 @@ int main(void) {
     	GWindowInit	wi;
 
 		gwinClearInit(&wi);
-    	wi.show = TRUE; wi.x = (gdispGetWidth()-GL3D_WINDOW_SIZE)/2; wi.y = (gdispGetHeight()-GL3D_WINDOW_SIZE)/2; wi.width = GL3D_WINDOW_SIZE; wi.height = GL3D_WINDOW_SIZE;
+    	wi.show = gTrue; wi.x = (gdispGetWidth()-GL3D_WINDOW_SIZE)/2; wi.y = (gdispGetHeight()-GL3D_WINDOW_SIZE)/2; wi.width = GL3D_WINDOW_SIZE; wi.height = GL3D_WINDOW_SIZE;
         gh = gwinGL3DCreate(0, &wi);
     }
 
@@ -162,7 +162,7 @@ int main(void) {
     Ystep = Zstep = 0.0;
 
 
-    while(TRUE) {
+    while(1) {
 
     	// rate control
     	gfxSleepMilliseconds(FRAME_DELAY);
diff --git a/demos/modules/gwin/graph/main.c b/demos/modules/gwin/graph/main.c
index 2ca4d1a6..c184a939 100644
--- a/demos/modules/gwin/graph/main.c
+++ b/demos/modules/gwin/graph/main.c
@@ -71,7 +71,7 @@ int main(void) {
     {
         GWindowInit wi;
  
-        wi.show = TRUE;
+        wi.show = gTrue;
         wi.x = wi.y = 0;
         wi.width = gdispGetWidth();
         wi.height = gdispGetHeight();
@@ -105,7 +105,7 @@ int main(void) {
     // Draw a set of points
     gwinGraphDrawPoints(gh, data, sizeof(data)/sizeof(data[0]));
 
-    while(TRUE) {
+    while(1) {
         gfxSleepMilliseconds(100);
     }
 }
diff --git a/demos/modules/gwin/imagebox/main.c b/demos/modules/gwin/imagebox/main.c
index c4f70df2..64156669 100644
--- a/demos/modules/gwin/imagebox/main.c
+++ b/demos/modules/gwin/imagebox/main.c
@@ -38,7 +38,7 @@ static void createWidgets(void) {
 
 	// Apply some default values for GWIN
 	gwinWidgetClearInit(&wi);
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
  
 	// create the first image widget
 	wi.g.x = 10; wi.g.y = 10; wi.g.width = 200; wi.g.height = 100;
@@ -52,7 +52,7 @@ int main(void) {
  
 	// Set the widget defaults
 	gwinSetDefaultFont(gdispOpenFont("UI2"));
-	gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+	gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
 	gdispClear(GFX_WHITE);
  
 	// create the widget
diff --git a/demos/modules/gwin/keyboard/main.c b/demos/modules/gwin/keyboard/main.c
index d81ac6a3..b43e72d1 100644
--- a/demos/modules/gwin/keyboard/main.c
+++ b/demos/modules/gwin/keyboard/main.c
@@ -43,7 +43,7 @@ static void createWidgets(void) {
 	gwinWidgetClearInit(&wi);
 
 	// Create the console - set colors before making it visible
-	wi.g.show = FALSE;
+	wi.g.show = gFalse;
 	wi.g.x = 0; wi.g.y = 0;
 	wi.g.width = gdispGetWidth(); wi.g.height = gdispGetHeight()/2;
 	ghConsole = gwinConsoleCreate(0, &wi.g);
@@ -53,7 +53,7 @@ static void createWidgets(void) {
 	gwinClear(ghConsole);
 
 	// Create the keyboard
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 	wi.g.x = 0; wi.g.y = gdispGetHeight()/2;
 	wi.g.width = gdispGetWidth(); wi.g.height = gdispGetHeight()/2;
 	ghKeyboard = gwinKeyboardCreate(0, &wi);
@@ -70,7 +70,7 @@ int main(void) {
 	// Set the widget defaults
 	font = gdispOpenFont("*");			// Get the first defined font.
 	gwinSetDefaultFont(font);
-	gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+	gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
 	gdispClear(GFX_WHITE);
 
 	// Create the gwin windows/widgets
diff --git a/demos/modules/gwin/label/main.c b/demos/modules/gwin/label/main.c
index f1fb6b92..6a2429a4 100644
--- a/demos/modules/gwin/label/main.c
+++ b/demos/modules/gwin/label/main.c
@@ -37,7 +37,7 @@ static void createWidgets(void) {
 
 	// Apply some default values for GWIN
 	gwinWidgetClearInit(&wi);
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 
 	// Create the IP label
 	wi.g.width = 200; wi.g.height = 20; wi.g.x = 10, wi.g.y = 80;
@@ -60,7 +60,7 @@ int main(void) {
 
 	// Set the widget defaults
 	gwinSetDefaultFont(gdispOpenFont("*"));
-	gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+	gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
 	gdispClear(GFX_WHITE);
 
 	// create the widget
diff --git a/demos/modules/gwin/list/main.c b/demos/modules/gwin/list/main.c
index 22a2074e..86e50e9a 100644
--- a/demos/modules/gwin/list/main.c
+++ b/demos/modules/gwin/list/main.c
@@ -38,7 +38,7 @@ static void createWidgets(void) {
 
 	// Apply some default values for GWIN
 	gwinWidgetClearInit(&wi);
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 
 	// Create the label for the first list
 	wi.g.width = 150; wi.g.height = 20; wi.g.x = 10, wi.g.y = 80;
@@ -56,7 +56,7 @@ static void createWidgets(void) {
 	wi.g.y = 100;
 	wi.g.x = 10;
 	wi.text = "Name of list 1";
-	ghList1 = gwinListCreate(0, &wi, FALSE);
+	ghList1 = gwinListCreate(0, &wi, gFalse);
 
 	// The second list widget
 	wi.g.width = 150;
@@ -64,7 +64,7 @@ static void createWidgets(void) {
 	wi.g.y = 100;
 	wi.g.x = 165;
 	wi.text = "Name of list 2";
-	ghList2 = gwinListCreate(0, &wi, FALSE);
+	ghList2 = gwinListCreate(0, &wi, gFalse);
 	gwinListSetScroll(ghList2, scrollSmooth);
 }
 
@@ -76,7 +76,7 @@ int main(void) {
 
 	// Set the widget defaults
 	gwinSetDefaultFont(gdispOpenFont("UI2"));
-	gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+	gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
 	gdispClear(GFX_WHITE);
 
 	// create the widget
@@ -87,40 +87,40 @@ int main(void) {
 	gwinAttachListener(&gl);
 
 	// Add some items to the first list widget
-	gwinListAddItem(ghList1, "Item 0", FALSE);
-	gwinListAddItem(ghList1, "Item 1", FALSE);
-	gwinListAddItem(ghList1, "Item 2", FALSE);
-	gwinListAddItem(ghList1, "Item 3", FALSE);
-	gwinListAddItem(ghList1, "Item 4", FALSE);
-	gwinListAddItem(ghList1, "Item 5", FALSE);
-	gwinListAddItem(ghList1, "Item 6", FALSE);
-	gwinListAddItem(ghList1, "Item 7", FALSE);
-	gwinListAddItem(ghList1, "Item 8", FALSE);
-	gwinListAddItem(ghList1, "Item 9", FALSE);
-	gwinListAddItem(ghList1, "Item 10", FALSE);
-	gwinListAddItem(ghList1, "Item 11", FALSE);
-	gwinListAddItem(ghList1, "Item 12", FALSE);
-	gwinListAddItem(ghList1, "Item 13", FALSE);
+	gwinListAddItem(ghList1, "Item 0", gFalse);
+	gwinListAddItem(ghList1, "Item 1", gFalse);
+	gwinListAddItem(ghList1, "Item 2", gFalse);
+	gwinListAddItem(ghList1, "Item 3", gFalse);
+	gwinListAddItem(ghList1, "Item 4", gFalse);
+	gwinListAddItem(ghList1, "Item 5", gFalse);
+	gwinListAddItem(ghList1, "Item 6", gFalse);
+	gwinListAddItem(ghList1, "Item 7", gFalse);
+	gwinListAddItem(ghList1, "Item 8", gFalse);
+	gwinListAddItem(ghList1, "Item 9", gFalse);
+	gwinListAddItem(ghList1, "Item 10", gFalse);
+	gwinListAddItem(ghList1, "Item 11", gFalse);
+	gwinListAddItem(ghList1, "Item 12", gFalse);
+	gwinListAddItem(ghList1, "Item 13", gFalse);
 
 	// Add some items to the second list widget
 	// This time we will disable the render until
 	// all the items have been added
-	gwinListEnableRender(ghList2, FALSE);
-	gwinListAddItem(ghList2, "Item 0", FALSE);
-	gwinListAddItem(ghList2, "Item 1", FALSE);
-	gwinListAddItem(ghList2, "Item 2", FALSE);
-	gwinListAddItem(ghList2, "Item 3", FALSE);
-	gwinListAddItem(ghList2, "Item 4", FALSE);
-	gwinListAddItem(ghList2, "Item 5", FALSE);
-	gwinListAddItem(ghList2, "Item 6", FALSE);
-	gwinListAddItem(ghList2, "Item 7", FALSE);
-	gwinListAddItem(ghList2, "Item 8", FALSE);
-	gwinListAddItem(ghList2, "Item 9", FALSE);
-	gwinListAddItem(ghList2, "Item 10", FALSE);
-	gwinListAddItem(ghList2, "Item 11", FALSE);
-	gwinListAddItem(ghList2, "Item 12", FALSE);
-	gwinListAddItem(ghList2, "Item 13", FALSE);
-	gwinListEnableRender(ghList2, TRUE);
+	gwinListEnableRender(ghList2, gFalse);
+	gwinListAddItem(ghList2, "Item 0", gFalse);
+	gwinListAddItem(ghList2, "Item 1", gFalse);
+	gwinListAddItem(ghList2, "Item 2", gFalse);
+	gwinListAddItem(ghList2, "Item 3", gFalse);
+	gwinListAddItem(ghList2, "Item 4", gFalse);
+	gwinListAddItem(ghList2, "Item 5", gFalse);
+	gwinListAddItem(ghList2, "Item 6", gFalse);
+	gwinListAddItem(ghList2, "Item 7", gFalse);
+	gwinListAddItem(ghList2, "Item 8", gFalse);
+	gwinListAddItem(ghList2, "Item 9", gFalse);
+	gwinListAddItem(ghList2, "Item 10", gFalse);
+	gwinListAddItem(ghList2, "Item 11", gFalse);
+	gwinListAddItem(ghList2, "Item 12", gFalse);
+	gwinListAddItem(ghList2, "Item 13", gFalse);
+	gwinListEnableRender(ghList2, gTrue);
 
 	while(1) {
 		// Get an Event
diff --git a/demos/modules/gwin/progressbar/main.c b/demos/modules/gwin/progressbar/main.c
index 374728cf..cf285014 100644
--- a/demos/modules/gwin/progressbar/main.c
+++ b/demos/modules/gwin/progressbar/main.c
@@ -6,7 +6,7 @@ static void _createWidget(void) {
 	GWidgetInit	wi;
  
 	gwinWidgetClearInit(&wi);
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
  
 	wi.g.y = 10; wi.g.x = 10; wi.g.width = 200; wi.g.height = 20; wi.text = "Progress 1";
 	ghProgressbar = gwinProgressbarCreate(0, &wi);
@@ -16,7 +16,7 @@ int main(void) {
 	gfxInit();
 
 	gwinSetDefaultFont(gdispOpenFont("UI2"));
-	gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+	gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
 	gdispClear(GFX_WHITE);
 
 	_createWidget();
diff --git a/demos/modules/gwin/radio/main.c b/demos/modules/gwin/radio/main.c
index 18c34e4c..f6cc5b4d 100644
--- a/demos/modules/gwin/radio/main.c
+++ b/demos/modules/gwin/radio/main.c
@@ -41,7 +41,7 @@ static void createWidgets(void) {
 
 	// Apply some default values for GWIN
 	gwinWidgetClearInit(&wi);
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 
 	// create Radio11
 	wi.g.y = 10; wi.g.x = 10; wi.g.width = 80; wi.g.height = 20; wi.text = "Radio 1";
@@ -80,7 +80,7 @@ int main(void) {
 
 	// Set the widget defaults
 	gwinSetDefaultFont(gdispOpenFont("UI2"));
-	gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+	gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
 	gdispClear(GFX_WHITE);
 
 	// create the widget
diff --git a/demos/modules/gwin/slider/main.c b/demos/modules/gwin/slider/main.c
index 5e90c554..b813a393 100644
--- a/demos/modules/gwin/slider/main.c
+++ b/demos/modules/gwin/slider/main.c
@@ -37,7 +37,7 @@ static void createWidgets(void) {
 
 	// Apply some default values for GWIN
 	gwinWidgetClearInit(&wi);
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 
 	// create Slider1
 	wi.g.y = 10; wi.g.x = 10; wi.g.width = gdispGetWidth()-20; wi.g.height = 20; wi.text = "S1";
@@ -48,7 +48,7 @@ static void createWidgets(void) {
 	ghSlider2 = gwinSliderCreate(0, &wi);
 
 	// Set slider 2 to return extended events
-	gwinSliderSendExtendedEvents(ghSlider2, TRUE);
+	gwinSliderSendExtendedEvents(ghSlider2, gTrue);
 
 	// Some options to try
 	//gwinSliderSetRange(ghSlider1, 0, 70000);
@@ -69,7 +69,7 @@ int main(void) {
 
 	// Set the widget defaults
 	gwinSetDefaultFont(gdispOpenFont("UI2"));
-	gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+	gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
 	gdispClear(GFX_WHITE);
 
 	// create the widget
diff --git a/demos/modules/gwin/tabset/main.c b/demos/modules/gwin/tabset/main.c
index c4472c39..bedd7ed8 100644
--- a/demos/modules/gwin/tabset/main.c
+++ b/demos/modules/gwin/tabset/main.c
@@ -39,14 +39,14 @@ static void createWidgets(void) {
 
 	// Apply some default values for GWIN
 	gwinWidgetClearInit(&wi);
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 
 	// Create the Tabset
 	wi.g.width = 200; wi.g.height = 200; wi.g.x = 10, wi.g.y = 10;
 	ghTabset = gwinTabsetCreate(0, &wi, GWIN_TABSET_BORDER);
-	ghPage1 = gwinTabsetAddTab(ghTabset, "Page 1", FALSE);
-	ghPage2 = gwinTabsetAddTab(ghTabset, "Page 2", FALSE);
-	ghPage3 = gwinTabsetAddTab(ghTabset, "Page 3", FALSE);
+	ghPage1 = gwinTabsetAddTab(ghTabset, "Page 1", gFalse);
+	ghPage2 = gwinTabsetAddTab(ghTabset, "Page 2", gFalse);
+	ghPage3 = gwinTabsetAddTab(ghTabset, "Page 3", gFalse);
 
 	// Add some widgets to Page 1
 	wi.g.width = 120; wi.g.height = 20; wi.g.x = 10; wi.g.y = 10;
@@ -75,7 +75,7 @@ int main(void) {
 
 	// Set the widget defaults
 	gwinSetDefaultFont(gdispOpenFont("UI2"));
-	gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+	gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
 	gdispClear(GFX_WHITE);
 
 	// create the widget
diff --git a/demos/modules/gwin/textedit/main.c b/demos/modules/gwin/textedit/main.c
index b3fafcf0..490a949c 100644
--- a/demos/modules/gwin/textedit/main.c
+++ b/demos/modules/gwin/textedit/main.c
@@ -44,7 +44,7 @@ static void guiCreate(void)
 	gwinWidgetClearInit(&wi);
 
 	// Console
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 	wi.g.x = 0;
 	wi.g.y = 0;
 	wi.g.width = gdispGetWidth()/2;
@@ -56,7 +56,7 @@ static void guiCreate(void)
 	gwinClear(ghConsole);
 
 	// TextEdit1
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 	wi.g.x = gdispGetWidth()/2 + 10;
 	wi.g.y = 20;
 	wi.g.width = 200;
@@ -65,28 +65,28 @@ static void guiCreate(void)
 	ghTextedit1 = gwinTexteditCreate(0, &wi, 100);
 
 	// TextEdit2
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 	wi.g.x = gdispGetWidth()/2 + 10;
 	wi.g.y = 100;
 	wi.g.width = 200;
 	wi.g.height = 35;
 	wi.text = "to switch between";
 	ghTextedit2 = gwinTexteditCreate(0, &wi, 20);
-	//gwinTexteditSetBorder(ghTextedit2, FALSE);
+	//gwinTexteditSetBorder(ghTextedit2, gFalse);
 
 	// TextEdit3
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 	wi.g.x = gdispGetWidth()/2 + 10;
 	wi.g.y = 180;
 	wi.g.width = 200;
 	wi.g.height = 35;
 	wi.text = "the different widgets";
 	ghTextedit3 = gwinTexteditCreate(0, &wi, 100);
-	//gwinTexteditSetBorder(ghTextedit3, TRUE);
+	//gwinTexteditSetBorder(ghTextedit3, gTrue);
 
 	// Virtual keyboard
 #if GWIN_NEED_KEYBOARD
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 	wi.g.x = 0;
 	wi.g.y = gdispGetHeight()*3/4;
 	wi.g.width = gdispGetWidth();
@@ -104,7 +104,7 @@ int main(void) {
 
 	gdispClear(GFX_SILVER);
 	gwinSetDefaultFont(gdispOpenFont("DejaVuSans16"));
-	gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+	gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
 	gwinSetDefaultColor(GFX_BLACK);
 	gwinSetDefaultBgColor(GFX_WHITE);
 
diff --git a/demos/modules/gwin/textedit_virtual_keyboard/main.c b/demos/modules/gwin/textedit_virtual_keyboard/main.c
index 6bc29a57..a7af1e08 100644
--- a/demos/modules/gwin/textedit_virtual_keyboard/main.c
+++ b/demos/modules/gwin/textedit_virtual_keyboard/main.c
@@ -41,7 +41,7 @@ static void guiCreate(void)
 	gwinWidgetClearInit(&wi);
 
 	// TextEdit1
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 	wi.g.x = 10;
 	wi.g.y = 20;
 	wi.g.width = 200;
@@ -50,7 +50,7 @@ static void guiCreate(void)
 	ghTextedit1 = gwinTexteditCreate(0, &wi, 100);
 
 	// TextEdit2
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 	wi.g.x = 10;
 	wi.g.y = 100;
 	wi.g.width = 200;
@@ -59,7 +59,7 @@ static void guiCreate(void)
 	ghTextedit2 = gwinTexteditCreate(0, &wi, 20);
 
 	// TextEdit3
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 	wi.g.x = 10;
 	wi.g.y = 180;
 	wi.g.width = 200;
@@ -68,7 +68,7 @@ static void guiCreate(void)
 	ghTextedit3 = gwinTexteditCreate(0, &wi, 100);
 
 	// Virtual keyboard
-	wi.g.show = TRUE;
+	wi.g.show = gTrue;
 	wi.g.x = 0;
 	wi.g.y = (gdispGetHeight()/2);
 	wi.g.width = gdispGetWidth();
@@ -82,7 +82,7 @@ int main(void)
 
 	gdispClear(GFX_SILVER);
 	gwinSetDefaultFont(gdispOpenFont("DejaVuSans16"));
-	gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+	gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
 	gwinSetDefaultColor(GFX_BLACK);
 	gwinSetDefaultBgColor(GFX_WHITE);
 
diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c
index 5f98387e..8e56af90 100644
--- a/demos/modules/gwin/widgets/main.c
+++ b/demos/modules/gwin/widgets/main.c
@@ -203,18 +203,18 @@ static void createWidgets(void) {
 
 	// Create the Tabs
 	#if GWIN_NEED_TABSET
-		wi.g.show = TRUE;
+		wi.g.show = gTrue;
 		wi.g.x = border; wi.g.y = 0;
 		wi.g.width = ScrWidth - 2*border; wi.g.height = ScrHeight-wi.g.y-border;
 		ghTabset			= gwinTabsetCreate(0, &wi, GWIN_TABSET_BORDER);
-		ghPgButtons			= gwinTabsetAddTab(ghTabset, "Buttons", FALSE);
-		ghPgSliders			= gwinTabsetAddTab(ghTabset, "Sliders", FALSE);
-		ghPgCheckboxes		= gwinTabsetAddTab(ghTabset, "Checkbox", FALSE);
-		ghPgRadios			= gwinTabsetAddTab(ghTabset, "Radios", FALSE);
-		ghPgLists			= gwinTabsetAddTab(ghTabset, "Lists", FALSE);
-		ghPgLabels			= gwinTabsetAddTab(ghTabset, "Labels", FALSE);
-		ghPgImages			= gwinTabsetAddTab(ghTabset, "Images", FALSE);
-		ghPgProgressbars	= gwinTabsetAddTab(ghTabset, "Progressbar", FALSE);
+		ghPgButtons			= gwinTabsetAddTab(ghTabset, "Buttons", gFalse);
+		ghPgSliders			= gwinTabsetAddTab(ghTabset, "Sliders", gFalse);
+		ghPgCheckboxes		= gwinTabsetAddTab(ghTabset, "Checkbox", gFalse);
+		ghPgRadios			= gwinTabsetAddTab(ghTabset, "Radios", gFalse);
+		ghPgLists			= gwinTabsetAddTab(ghTabset, "Lists", gFalse);
+		ghPgLabels			= gwinTabsetAddTab(ghTabset, "Labels", gFalse);
+		ghPgImages			= gwinTabsetAddTab(ghTabset, "Images", gFalse);
+		ghPgProgressbars	= gwinTabsetAddTab(ghTabset, "Progressbar", gFalse);
 
 		pagewidth = gwinGetInnerWidth(ghTabset)/2;
 
@@ -229,7 +229,7 @@ static void createWidgets(void) {
 	    gwinSetBgColor(ghConsole, HTML2COLOR(0xF0F0F0));
 
 	#else
-		wi.g.show = TRUE; wi.customDraw = gwinRadioDraw_Tab;
+		wi.g.show = gTrue; wi.customDraw = gwinRadioDraw_Tab;
 		wi.g.height = TAB_HEIGHT; wi.g.y = 0;
 		wi.g.x = 0; setbtntext(&wi, ScrWidth, "Buttons");
 		ghTabButtons     = gwinRadioCreate(0, &wi, GROUP_TABS);
@@ -251,7 +251,7 @@ static void createWidgets(void) {
 		wi.customDraw = 0;
 
 		// Create the Pages
-		wi.g.show = FALSE;
+		wi.g.show = gFalse;
 		wi.g.x = border; wi.g.y += border;
 		wi.g.width = ScrWidth/2 - border; wi.g.height = ScrHeight-wi.g.y-border;
 		ghPgButtons			= gwinContainerCreate(0, &wi, GWIN_CONTAINER_BORDER);
@@ -262,7 +262,7 @@ static void createWidgets(void) {
 		ghPgLabels			= gwinContainerCreate(0, &wi, GWIN_CONTAINER_BORDER);
 		ghPgImages			= gwinContainerCreate(0, &wi, GWIN_CONTAINER_BORDER);
 		ghPgProgressbars	= gwinContainerCreate(0, &wi, GWIN_CONTAINER_BORDER);
-		wi.g.show = TRUE;
+		wi.g.show = gTrue;
 
 		// Console - we apply some special colors before making it visible
 		wi.g.x = ScrWidth/2+border;
@@ -363,62 +363,62 @@ static void createWidgets(void) {
 	wi.g.parent = ghPgLists;
 	wi.g.width = LIST_WIDTH; wi.g.height = LIST_HEIGHT; wi.g.y = border;
 	wi.g.x = border; wi.text = "L1";
-	ghList1 = gwinListCreate(0, &wi, FALSE);
-	gwinListAddItem(ghList1, "Item 0", FALSE);
-	gwinListAddItem(ghList1, "Item 1", FALSE);
-	gwinListAddItem(ghList1, "Item 2", FALSE);
-	gwinListAddItem(ghList1, "Item 3", FALSE);
-	gwinListAddItem(ghList1, "Item 4", FALSE);
-	gwinListAddItem(ghList1, "Item 5", FALSE);
-	gwinListAddItem(ghList1, "Item 6", FALSE);
-	gwinListAddItem(ghList1, "Item 7", FALSE);
-	gwinListAddItem(ghList1, "Item 8", FALSE);
-	gwinListAddItem(ghList1, "Item 9", FALSE);
-	gwinListAddItem(ghList1, "Item 10", FALSE);
-	gwinListAddItem(ghList1, "Item 11", FALSE);
-	gwinListAddItem(ghList1, "Item 12", FALSE);
-	gwinListAddItem(ghList1, "Item 13", FALSE);
+	ghList1 = gwinListCreate(0, &wi, gFalse);
+	gwinListAddItem(ghList1, "Item 0", gFalse);
+	gwinListAddItem(ghList1, "Item 1", gFalse);
+	gwinListAddItem(ghList1, "Item 2", gFalse);
+	gwinListAddItem(ghList1, "Item 3", gFalse);
+	gwinListAddItem(ghList1, "Item 4", gFalse);
+	gwinListAddItem(ghList1, "Item 5", gFalse);
+	gwinListAddItem(ghList1, "Item 6", gFalse);
+	gwinListAddItem(ghList1, "Item 7", gFalse);
+	gwinListAddItem(ghList1, "Item 8", gFalse);
+	gwinListAddItem(ghList1, "Item 9", gFalse);
+	gwinListAddItem(ghList1, "Item 10", gFalse);
+	gwinListAddItem(ghList1, "Item 11", gFalse);
+	gwinListAddItem(ghList1, "Item 12", gFalse);
+	gwinListAddItem(ghList1, "Item 13", gFalse);
 	wi.text = "L2"; wi.g.x += LIST_WIDTH+border; if (wi.g.x + LIST_WIDTH > pagewidth) { wi.g.x = border; wi.g.y += LIST_HEIGHT+border; }
-	ghList2 = gwinListCreate(0, &wi, TRUE);
-	gwinListAddItem(ghList2, "Item 0", FALSE);
-	gwinListAddItem(ghList2, "Item 1", FALSE);
-	gwinListAddItem(ghList2, "Item 2", FALSE);
-	gwinListAddItem(ghList2, "Item 3", FALSE);
-	gwinListAddItem(ghList2, "Item 4", FALSE);
-	gwinListAddItem(ghList2, "Item 5", FALSE);
-	gwinListAddItem(ghList2, "Item 6", FALSE);
-	gwinListAddItem(ghList2, "Item 7", FALSE);
-	gwinListAddItem(ghList2, "Item 8", FALSE);
-	gwinListAddItem(ghList2, "Item 9", FALSE);
-	gwinListAddItem(ghList2, "Item 10", FALSE);
-	gwinListAddItem(ghList2, "Item 11", FALSE);
-	gwinListAddItem(ghList2, "Item 12", FALSE);
-	gwinListAddItem(ghList2, "Item 13", FALSE);
+	ghList2 = gwinListCreate(0, &wi, gTrue);
+	gwinListAddItem(ghList2, "Item 0", gFalse);
+	gwinListAddItem(ghList2, "Item 1", gFalse);
+	gwinListAddItem(ghList2, "Item 2", gFalse);
+	gwinListAddItem(ghList2, "Item 3", gFalse);
+	gwinListAddItem(ghList2, "Item 4", gFalse);
+	gwinListAddItem(ghList2, "Item 5", gFalse);
+	gwinListAddItem(ghList2, "Item 6", gFalse);
+	gwinListAddItem(ghList2, "Item 7", gFalse);
+	gwinListAddItem(ghList2, "Item 8", gFalse);
+	gwinListAddItem(ghList2, "Item 9", gFalse);
+	gwinListAddItem(ghList2, "Item 10", gFalse);
+	gwinListAddItem(ghList2, "Item 11", gFalse);
+	gwinListAddItem(ghList2, "Item 12", gFalse);
+	gwinListAddItem(ghList2, "Item 13", gFalse);
 	wi.text = "L3"; wi.g.x += LIST_WIDTH+border; if (wi.g.x + LIST_WIDTH > pagewidth) { wi.g.x = border; wi.g.y += LIST_HEIGHT+border; }
-	ghList3 = gwinListCreate(0, &wi, TRUE);
-	gwinListAddItem(ghList3, "Item 0", FALSE);
-	gwinListAddItem(ghList3, "Item 1", FALSE);
-	gwinListAddItem(ghList3, "Item 2", FALSE);
-	gwinListAddItem(ghList3, "Item 3", FALSE);
+	ghList3 = gwinListCreate(0, &wi, gTrue);
+	gwinListAddItem(ghList3, "Item 0", gFalse);
+	gwinListAddItem(ghList3, "Item 1", gFalse);
+	gwinListAddItem(ghList3, "Item 2", gFalse);
+	gwinListAddItem(ghList3, "Item 3", gFalse);
 	gdispImageOpenFile(&imgYesNo, "image_yesno.gif");
 	gwinListItemSetImage(ghList3, 1, &imgYesNo);
 	gwinListItemSetImage(ghList3, 3, &imgYesNo);
 	wi.text = "L4"; wi.g.x += LIST_WIDTH+border; if (wi.g.x + LIST_WIDTH > pagewidth) { wi.g.x = border; wi.g.y += LIST_HEIGHT+border; }
-	ghList4 = gwinListCreate(0, &wi, TRUE);
-	gwinListAddItem(ghList4, "Item 0", FALSE);
-	gwinListAddItem(ghList4, "Item 1", FALSE);
-	gwinListAddItem(ghList4, "Item 2", FALSE);
-	gwinListAddItem(ghList4, "Item 3", FALSE);
-	gwinListAddItem(ghList4, "Item 4", FALSE);
-	gwinListAddItem(ghList4, "Item 5", FALSE);
-	gwinListAddItem(ghList4, "Item 6", FALSE);
-	gwinListAddItem(ghList4, "Item 7", FALSE);
-	gwinListAddItem(ghList4, "Item 8", FALSE);
-	gwinListAddItem(ghList4, "Item 9", FALSE);
-	gwinListAddItem(ghList4, "Item 10", FALSE);
-	gwinListAddItem(ghList4, "Item 11", FALSE);
-	gwinListAddItem(ghList4, "Item 12", FALSE);
-	gwinListAddItem(ghList4, "Item 13", FALSE);
+	ghList4 = gwinListCreate(0, &wi, gTrue);
+	gwinListAddItem(ghList4, "Item 0", gFalse);
+	gwinListAddItem(ghList4, "Item 1", gFalse);
+	gwinListAddItem(ghList4, "Item 2", gFalse);
+	gwinListAddItem(ghList4, "Item 3", gFalse);
+	gwinListAddItem(ghList4, "Item 4", gFalse);
+	gwinListAddItem(ghList4, "Item 5", gFalse);
+	gwinListAddItem(ghList4, "Item 6", gFalse);
+	gwinListAddItem(ghList4, "Item 7", gFalse);
+	gwinListAddItem(ghList4, "Item 8", gFalse);
+	gwinListAddItem(ghList4, "Item 9", gFalse);
+	gwinListAddItem(ghList4, "Item 10", gFalse);
+	gwinListAddItem(ghList4, "Item 11", gFalse);
+	gwinListAddItem(ghList4, "Item 12", gFalse);
+	gwinListAddItem(ghList4, "Item 13", gFalse);
 	gwinListSetScroll(ghList4, scrollSmooth);
 
 	// Image
@@ -443,25 +443,25 @@ static void setLabels(void) {
 
 	// The sliders
 	snprintg(tmp, sizeof(tmp), "%d%%", gwinSliderGetPosition(ghSlider1));
-	gwinSetText(ghLabelSlider1, tmp, TRUE);
+	gwinSetText(ghLabelSlider1, tmp, gTrue);
 	snprintg(tmp, sizeof(tmp), "%d%%", gwinSliderGetPosition(ghSlider2));
-	gwinSetText(ghLabelSlider2, tmp, TRUE);
+	gwinSetText(ghLabelSlider2, tmp, gTrue);
 	snprintg(tmp, sizeof(tmp), "%d%%", gwinSliderGetPosition(ghSlider3));
-	gwinSetText(ghLabelSlider3, tmp, TRUE);
+	gwinSetText(ghLabelSlider3, tmp, gTrue);
 	snprintg(tmp, sizeof(tmp), "%d%%", gwinSliderGetPosition(ghSlider4));
-	gwinSetText(ghLabelSlider4, tmp, TRUE);
+	gwinSetText(ghLabelSlider4, tmp, gTrue);
 
 	// The radio buttons
 	if (gwinRadioIsPressed(ghRadio1))
-		gwinSetText(ghLabelRadio1, "Yes", TRUE);
+		gwinSetText(ghLabelRadio1, "Yes", gTrue);
 	else if (gwinRadioIsPressed(ghRadio2))
-		gwinSetText(ghLabelRadio1, "No", TRUE);
+		gwinSetText(ghLabelRadio1, "No", gTrue);
 }
 
 /**
  * Control the progress bar auto-increment
  */
-static void setProgressbar(bool_t onoff) {
+static void setProgressbar(gBool onoff) {
 	if (onoff)
 		gwinProgressbarStart(ghProgressbar1, 500);
 	else {
@@ -473,7 +473,7 @@ static void setProgressbar(bool_t onoff) {
 /**
  * Set the enabled state of every widget (except the tabs etc)
  */
-static void setEnabled(bool_t ena) {
+static void setEnabled(gBool ena) {
 	gwinSetEnabled(ghPgButtons, ena);
 	gwinSetEnabled(ghPgSliders, ena);
 	gwinSetEnabled(ghPgLabels, ena);
@@ -485,7 +485,7 @@ static void setEnabled(bool_t ena) {
 	gwinSetEnabled(ghCheckbox1, ena);
 	gwinSetEnabled(ghCheckbox2, ena);
 	gwinSetEnabled(ghCheckbox3, ena);
-	//gwinSetEnabled(ghCheckDisableAll, TRUE);
+	//gwinSetEnabled(ghCheckDisableAll, gTrue);
 }
 
 static void FlashOffFn(void *param) {
@@ -503,7 +503,7 @@ int main(void) {
 	// Set the widget defaults
 	font = gdispOpenFont("*");			// Get the first defined font.
 	gwinSetDefaultFont(font);
-	gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
+	gwinSetDefaultStyle(&WhiteWidgetStyle, gFalse);
 	gdispClear(GFX_WHITE);
 
 	// Create the gwin windows/widgets
@@ -557,7 +557,7 @@ int main(void) {
 			// If it is the toggle button checkbox start the flash.
 			} else if (((GEventGWinCheckbox *)pe)->gwin == ghCheckbox3) {
 				gwinFlash(ghCheckbox3);
-				gtimerStart(&FlashTimer, FlashOffFn, 0, FALSE, 3000);
+				gtimerStart(&FlashTimer, FlashOffFn, 0, gFalse, 3000);
 			}
 			break;
 
@@ -600,7 +600,7 @@ int main(void) {
 					gdispClear(pstyle->background);
 
 					// Update the style on all controls
-					gwinSetDefaultStyle(pstyle, TRUE);
+					gwinSetDefaultStyle(pstyle, gTrue);
 				}
 				break;
 			}