From 41271d632b74f5cf47c30d3b699eb6b2786f2136 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Sat, 23 Jun 2018 13:02:07 +1000
Subject: Added new type definitions - moving towards V3.0

---
 demos/3rdparty/notepad-2/main.c        |  4 ++--
 demos/3rdparty/notepad-2/notepadApp.c  | 10 +++++-----
 demos/3rdparty/notepad-2/notepadCore.c |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'demos/3rdparty/notepad-2')

diff --git a/demos/3rdparty/notepad-2/main.c b/demos/3rdparty/notepad-2/main.c
index 05481b18..ec9acd0c 100644
--- a/demos/3rdparty/notepad-2/main.c
+++ b/demos/3rdparty/notepad-2/main.c
@@ -81,13 +81,13 @@ int main(void) {
   gfxInit();
 
   /* Calibrate the touchscreen */
-  ginputSetMouseCalibrationRoutines(0, NULL, tsCalibRead, FALSE);
+  ginputSetMouseCalibrationRoutines(0, NULL, tsCalibRead, gFalse);
   ginputGetMouse(0);
 
   // Set the color scheme
   nSetColorScheme(schemeDefault);
 
-  while (TRUE) {
+  while (1) {
 	gfxThreadWait(nLaunchNotepadApp());
 
 	gdispSetClip(0, 0, gdispGetWidth(), gdispGetHeight());
diff --git a/demos/3rdparty/notepad-2/notepadApp.c b/demos/3rdparty/notepad-2/notepadApp.c
index 9f61aaa4..0540da2c 100644
--- a/demos/3rdparty/notepad-2/notepadApp.c
+++ b/demos/3rdparty/notepad-2/notepadApp.c
@@ -73,7 +73,7 @@ static NColorScheme nCurColorScheme;
 static DECLARE_THREAD_FUNCTION(notepadThread, param);
 
 // Custom drawing functions for the buttons
-static void nbtnColorBarDraw(GHandle gh, bool_t enabled, bool_t isdown, const char *txt, const GButtonDrawStyle *pstyle, void *param) {
+static void nbtnColorBarDraw(GHandle gh, gBool enabled, gBool isdown, const char *txt, const GButtonDrawStyle *pstyle, void *param) {
   #define ccs nCurColorScheme
 
   int i, j, k;
@@ -152,7 +152,7 @@ static void nbtnColorBarDraw(GHandle gh, bool_t enabled, bool_t isdown, const ch
   #undef ccs
 }
 
-static void nbtnColorBarSelDraw(GHandle gh, bool_t enabled, bool_t isdown, const char *txt, const GButtonDrawStyle *pstyle, void *param) {
+static void nbtnColorBarSelDraw(GHandle gh, gBool enabled, gBool isdown, const char *txt, const GButtonDrawStyle *pstyle, void *param) {
 #define ccs nCurColorScheme
 
   int i, j = 0, k;
@@ -215,7 +215,7 @@ static void nbtnColorBarSelDraw(GHandle gh, bool_t enabled, bool_t isdown, const
   #undef ccs
 }
 
-static void nToolbarImageButtonDraw(GHandle gh, bool_t isenabled, bool_t isdown, const char *txt, const GButtonDrawStyle *pstyle, void *param) {
+static void nToolbarImageButtonDraw(GHandle gh, gBool isenabled, gBool isdown, const char *txt, const GButtonDrawStyle *pstyle, void *param) {
   (void)txt;  (void)pstyle; (void)isenabled;
 
   color_t cl = isdown ? nCurColorScheme.toolbarBgActive : nCurColorScheme.toolbarBgUnsel;
@@ -228,7 +228,7 @@ static void nToolbarImageButtonDraw(GHandle gh, bool_t isenabled, bool_t isdown,
 	gdispDrawBox(gh->x, gh->y, gh->width, gh->height, nCurColorScheme.toolbarSeparator);
 }
 
-static void nCloseButtonDraw(GHandle gh, bool_t isenabled, bool_t isdown, const char *txt, const GButtonDrawStyle *pstyle, void *param) {
+static void nCloseButtonDraw(GHandle gh, gBool isenabled, gBool isdown, const char *txt, const GButtonDrawStyle *pstyle, void *param) {
   (void) isenabled;
   (void) isdown;
   (void) txt;
@@ -401,7 +401,7 @@ static DECLARE_THREAD_FUNCTION(notepadThread, param) {
 
   ncoreSpawnDrawThread(nDrawingArea, gstatusConsole);
 
-  while(TRUE) {
+  while(1) {
 	  pem = (GEventMouse *) geventEventWait(&gl, TIME_INFINITE);
 
 	  /* button pressed... */
diff --git a/demos/3rdparty/notepad-2/notepadCore.c b/demos/3rdparty/notepad-2/notepadCore.c
index 931ec331..65afc988 100644
--- a/demos/3rdparty/notepad-2/notepadCore.c
+++ b/demos/3rdparty/notepad-2/notepadCore.c
@@ -53,7 +53,7 @@ static gfxThreadHandle			nThd;
 static GHandle					ncoreDrawingArea = NULL;
 static GHandle					nStatusConsole = NULL;
 
-static volatile bool_t			doExit;
+static volatile gBool			doExit;
 
 static void draw_point(coord_t x, coord_t y) {
   color_t c = ncoreDrawingArea->color;
@@ -204,7 +204,7 @@ void ncoreSpawnDrawThread(GHandle drawingArea, GHandle statusConsole) {
 
   ncoreDrawingArea = drawingArea;
   nStatusConsole = statusConsole;
-  doExit = FALSE;
+  doExit = gFalse;
 
   nThd = gfxThreadCreate(waDrawThread,
                            sizeof(waDrawThread),
@@ -216,7 +216,7 @@ void ncoreSpawnDrawThread(GHandle drawingArea, GHandle statusConsole) {
 
 /* Terminate the core thread, wait for control release */
 void ncoreTerminateDrawThread(void) {
-  doExit = TRUE;
+  doExit = gTrue;
   gfxThreadWait(nThd);
   nThd = 0;
 }
-- 
cgit v1.2.3