4 files changed, 15 insertions, 15 deletions
diff --git a/demos/3rdparty/notepad-2/main.c b/demos/3rdparty/notepad-2/main.c
index c61e7d94..f20d1899 100644
--- a/demos/3rdparty/notepad-2/main.c
+++ b/demos/3rdparty/notepad-2/main.c
@@ -66,7 +66,7 @@ const NColorScheme schemeDefault2 = {
   .statusBarText = HTML2COLOR(0x000000)
 };
 
-const char *tsCalibRead(uint16_t instance) {
+const char *tsCalibRead(gU16 instance) {
   // This will perform a on-spot calibration
   // Unless you read and add the co-efficients here
   (void) instance;
diff --git a/demos/3rdparty/notepad-2/notepadApp.c b/demos/3rdparty/notepad-2/notepadApp.c
index 3b5d2cef..1f94070d 100644
--- a/demos/3rdparty/notepad-2/notepadApp.c
+++ b/demos/3rdparty/notepad-2/notepadApp.c
@@ -96,7 +96,7 @@ static void nbtnColorBarDraw(GHandle gh, gBool enabled, gBool isdown, const char
 		// Update selection - this is like lazy release.
 		if (k >= 0 && k <= 7) {
 		  selPenWidth = k + 1;
-		  ncoreSetPenWidth((uint8_t) selPenWidth);
+		  ncoreSetPenWidth((gU8) selPenWidth);
 		}
 
 		gdispFillArea(gh->x + NPAD_TOOLBAR_BTN_WIDTH * i, gh->y,
diff --git a/demos/3rdparty/notepad-2/notepadCore.c b/demos/3rdparty/notepad-2/notepadCore.c
index 73a877a9..4662a9ba 100644
--- a/demos/3rdparty/notepad-2/notepadCore.c
+++ b/demos/3rdparty/notepad-2/notepadCore.c
@@ -45,8 +45,8 @@
 /* This is the drawing core */
 static DECLARE_THREAD_STACK(waDrawThread, NCORE_THD_STACK_SIZE);
 
-static uint8_t 					nPenWidth = 1;
-static uint8_t 					nMode = NCORE_MODE_DRAW;
+static gU8 					nPenWidth = 1;
+static gU8 					nMode = NCORE_MODE_DRAW;
 
 static gThread			nThd;
 
@@ -72,9 +72,9 @@ static void draw_point(gCoord x, gCoord y) {
 /* Bresenham's Line Drawing Algorithm
    Modified version to draw line of variable thickness */
 static void draw_line(gCoord x0, gCoord y0, gCoord x1, gCoord y1) {
-  int16_t dy, dx;
-  int16_t addx, addy;
-  int16_t P, diff, i;
+  gI16 dy, dx;
+  gI16 addx, addy;
+  gI16 P, diff, i;
   
   if (x1 >= x0) {
 	  dx = x1 - x0;
@@ -223,13 +223,13 @@ void ncoreTerminateDrawThread(void) {
 
 /* Get and set the pen width
  * Brush is cicular, width is pixel radius */
-void ncoreSetPenWidth(uint8_t penWidth) { nPenWidth = penWidth; }
-uint8_t ncoreGetPenWidth(void) 			{ return nPenWidth; }
+void ncoreSetPenWidth(gU8 penWidth) { nPenWidth = penWidth; }
+gU8 ncoreGetPenWidth(void) 			{ return nPenWidth; }
 
 /* Get and set the drawing color */
 void ncoreSetPenColor(gColor penColor) { gwinSetColor(ncoreDrawingArea, penColor); }
 gColor ncoreGetPenColor(void) 			{ return ncoreDrawingArea->color; }
 
 /* Set mode */
-void ncoreSetMode(uint8_t mode)			{ nMode = mode; }
-uint8_t ncoreGetMode(void)				{ return nMode; }
+void ncoreSetMode(gU8 mode)			{ nMode = mode; }
+gU8 ncoreGetMode(void)				{ return nMode; }
diff --git a/demos/3rdparty/notepad-2/notepadCore.h b/demos/3rdparty/notepad-2/notepadCore.h
index e4b78cdc..93fceb7d 100644
--- a/demos/3rdparty/notepad-2/notepadCore.h
+++ b/demos/3rdparty/notepad-2/notepadCore.h
@@ -54,15 +54,15 @@ void ncoreTerminateDrawThread(void);
 
 /* Get and set the pen width
  * Brush is cicular, width is pixel radius */
-void ncoreSetPenWidth(uint8_t penWidth);
-uint8_t ncoreGetPenWidth(void);
+void ncoreSetPenWidth(gU8 penWidth);
+gU8 ncoreGetPenWidth(void);
 
 /* Get and set the drawing color */
 void ncoreSetPenColor(gColor penColor);
 gColor ncoreGetPenColor(void);
 
 /* Get and set the pen mode */
-void ncoreSetMode(uint8_t mode);
-uint8_t ncoreGetMode(void);
+void ncoreSetMode(gU8 mode);
+gU8 ncoreGetMode(void);
 
 #endif /* NOTEPADCORE_H_ */