4 files changed, 18 insertions, 18 deletions
diff --git a/demos/3rdparty/notepad-2/notepadApp.c b/demos/3rdparty/notepad-2/notepadApp.c
index 57d2ad20..722e2c8d 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[] = { GFX_BLACK, GFX_RED, GFX_GREEN, GFX_BLUE, GFX_CYAN, GFX_MAGENTA, GFX_YELLOW, GFX_WHITE };
+static gColor myColors[] = { GFX_BLACK, GFX_RED, GFX_GREEN, GFX_BLUE, GFX_CYAN, GFX_MAGENTA, GFX_YELLOW, GFX_WHITE };
 
-static color_t selColor = GFX_BLACK;
+static gColor selColor = GFX_BLACK;
 static int selColorIndex = 0, selPenWidth = 1, tbMode = 1;
 
 static NColorScheme nCurColorScheme;
@@ -156,7 +156,7 @@ static void nbtnColorBarSelDraw(GHandle gh, gBool enabled, gBool isdown, const c
 #define ccs nCurColorScheme
 
   int i, j = 0, k;
-  color_t ca, cb;
+  gColor ca, cb;
   GEventMouse ptr;
 
   (void)txt;
@@ -218,7 +218,7 @@ static void nbtnColorBarSelDraw(GHandle gh, gBool enabled, gBool isdown, const c
 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;
+  gColor cl = isdown ? nCurColorScheme.toolbarBgActive : nCurColorScheme.toolbarBgUnsel;
 
   gdispImageSetBgColor(&toolbarImageFilmstrip, cl);
   gdispFillArea(gh->x, gh->y, gh->width, gh->height, cl);
diff --git a/demos/3rdparty/notepad-2/notepadCore.c b/demos/3rdparty/notepad-2/notepadCore.c
index 2a739e12..ffe95d50 100644
--- a/demos/3rdparty/notepad-2/notepadCore.c
+++ b/demos/3rdparty/notepad-2/notepadCore.c
@@ -56,7 +56,7 @@ static GHandle					nStatusConsole = NULL;
 static volatile gBool			doExit;
 
 static void draw_point(gCoord x, gCoord y) {
-  color_t c = ncoreDrawingArea->color;
+  gColor c = ncoreDrawingArea->color;
 
   if (nMode == NCORE_MODE_DRAW)
 	c = ncoreDrawingArea->color;
@@ -227,8 +227,8 @@ void ncoreSetPenWidth(uint8_t penWidth) { nPenWidth = penWidth; }
 uint8_t ncoreGetPenWidth(void) 			{ return nPenWidth; }
 
 /* Get and set the drawing color */
-void ncoreSetPenColor(color_t penColor) { gwinSetColor(ncoreDrawingArea, penColor); }
-color_t ncoreGetPenColor(void) 			{ return ncoreDrawingArea->color; }
+void ncoreSetPenColor(gColor penColor) { gwinSetColor(ncoreDrawingArea, penColor); }
+gColor ncoreGetPenColor(void) 			{ return ncoreDrawingArea->color; }
 
 /* Set mode */
 void ncoreSetMode(uint8_t mode)			{ nMode = mode; }
diff --git a/demos/3rdparty/notepad-2/notepadCore.h b/demos/3rdparty/notepad-2/notepadCore.h
index 937a023b..dc75be3e 100644
--- a/demos/3rdparty/notepad-2/notepadCore.h
+++ b/demos/3rdparty/notepad-2/notepadCore.h
@@ -58,8 +58,8 @@ void ncoreSetPenWidth(uint8_t penWidth);
 uint8_t ncoreGetPenWidth(void);
 
 /* Get and set the drawing color */
-void ncoreSetPenColor(color_t penColor);
-color_t ncoreGetPenColor(void);
+void ncoreSetPenColor(gColor penColor);
+gColor ncoreGetPenColor(void);
 
 /* Get and set the pen mode */
 void ncoreSetMode(uint8_t mode);
diff --git a/demos/3rdparty/notepad-2/notepadUIDefines.h b/demos/3rdparty/notepad-2/notepadUIDefines.h
index 4d3aef9b..e1637d87 100644
--- a/demos/3rdparty/notepad-2/notepadUIDefines.h
+++ b/demos/3rdparty/notepad-2/notepadUIDefines.h
@@ -97,18 +97,18 @@
 
 /* Color scheme definition */
 typedef struct colScheme {
-	color_t titleBarColor;
-	color_t titleTextColor;
+	gColor titleBarColor;
+	gColor titleTextColor;
 
-	color_t winBgColor;
-	color_t drawingWinBorder;
+	gColor winBgColor;
+	gColor drawingWinBorder;
 
-	color_t toolbarSeparator;
-	color_t toolbarBgUnsel;
-	color_t toolbarBgActive;
-	color_t toolbarBgSel;
+	gColor toolbarSeparator;
+	gColor toolbarBgUnsel;
+	gColor toolbarBgActive;
+	gColor toolbarBgSel;
 
-	color_t statusBarText;
+	gColor statusBarText;
 } NColorScheme;