diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-07-08 11:19:43 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-07-08 11:19:43 +1000 |
commit | f9c848e9851713d7a33962b9b4768c0a0d1751f1 (patch) | |
tree | 2b2caf1949078428ca3fd3cd47547d0485efa407 /demos/3rdparty/notepad-2/notepadApp.c | |
parent | cfb1b2a488d5b1a9e14c889b80e5324d16f63f1b (diff) | |
download | uGFX-f9c848e9851713d7a33962b9b4768c0a0d1751f1.tar.gz uGFX-f9c848e9851713d7a33962b9b4768c0a0d1751f1.tar.bz2 uGFX-f9c848e9851713d7a33962b9b4768c0a0d1751f1.zip |
Change color_t to gColor
Diffstat (limited to 'demos/3rdparty/notepad-2/notepadApp.c')
-rw-r--r-- | demos/3rdparty/notepad-2/notepadApp.c | 8 |
1 files changed, 4 insertions, 4 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); |