diff options
| author | inmarket <andrewh@inmarket.com.au> | 2018-03-10 20:36:12 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2018-03-10 20:36:12 +1000 |
| commit | 94f1cc2f0a4db0c6f1483e6d648068e031bcc094 (patch) | |
| tree | 97f50372239108ec9e6e75a3d56e808e479cb7be /demos/3rdparty | |
| parent | f265924396167729e8d9fb36a0383263f36c1270 (diff) | |
| download | uGFX-94f1cc2f0a4db0c6f1483e6d648068e031bcc094.tar.gz uGFX-94f1cc2f0a4db0c6f1483e6d648068e031bcc094.tar.bz2 uGFX-94f1cc2f0a4db0c6f1483e6d648068e031bcc094.zip | |
Change new colors to GFX_RED instead of GFXRED. Use the new color defs
Diffstat (limited to 'demos/3rdparty')
| -rw-r--r-- | demos/3rdparty/notepad-2/main.c | 10 | ||||
| -rw-r--r-- | demos/3rdparty/notepad-2/notepadApp.c | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/demos/3rdparty/notepad-2/main.c b/demos/3rdparty/notepad-2/main.c index e4649146..05481b18 100644 --- a/demos/3rdparty/notepad-2/main.c +++ b/demos/3rdparty/notepad-2/main.c @@ -38,7 +38,7 @@ const NColorScheme schemeDefault = { .titleBarColor = HTML2COLOR(0x3064D8), - .titleTextColor = White, + .titleTextColor = GFX_WHITE, .winBgColor = HTML2COLOR(0xFFECB0), .drawingWinBorder = HTML2COLOR(0xCEBA77), @@ -53,7 +53,7 @@ const NColorScheme schemeDefault = { const NColorScheme schemeDefault2 = { .titleBarColor = HTML2COLOR(0x3064D8), - .titleTextColor = White, + .titleTextColor = GFX_WHITE, .winBgColor = HTML2COLOR(0xC8D8F8), .drawingWinBorder = HTML2COLOR(0x8098E0), @@ -91,9 +91,9 @@ int main(void) { gfxThreadWait(nLaunchNotepadApp()); gdispSetClip(0, 0, gdispGetWidth(), gdispGetHeight()); - gdispClear(Black); - gdispDrawString(3, 3, "Notepad Terminated.", font, White); - gdispDrawString(3, 20, "Relaunching Notepad App...", font, White); + gdispClear(GFX_BLACK); + gdispDrawString(3, 3, "Notepad Terminated.", font, GFX_WHITE); + gdispDrawString(3, 20, "Relaunching Notepad App...", font, GFX_WHITE); gfxSleepMilliseconds(1000); } diff --git a/demos/3rdparty/notepad-2/notepadApp.c b/demos/3rdparty/notepad-2/notepadApp.c index 83186d38..9f61aaa4 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[] = { Black, Red, Green, Blue, Cyan, Magenta, Yellow, White }; +static color_t myColors[] = { GFX_BLACK, GFX_RED, GFX_GREEN, GFX_BLUE, GFX_CYAN, GFX_MAGENTA, GFX_YELLOW, GFX_WHITE }; -static color_t selColor = Black; +static color_t selColor = GFX_BLACK; static int selColorIndex = 0, selPenWidth = 1, tbMode = 1; static NColorScheme nCurColorScheme; @@ -383,13 +383,13 @@ static DECLARE_THREAD_FUNCTION(notepadThread, param) { 0); gwinSetBgColor(ghc, nCurColorScheme.winBgColor); - gwinSetColor(ghc, Black); + gwinSetColor(ghc, GFX_BLACK); gstatusConsole = ghc; /* draw the buttons */ - gwinSetColor(nDrawingArea, Black); - gwinSetBgColor(nDrawingArea, White); + gwinSetColor(nDrawingArea, GFX_BLACK); + gwinSetBgColor(nDrawingArea, GFX_WHITE); gwinClear(nDrawingArea); gwinClear(ghc); @@ -414,8 +414,8 @@ static DECLARE_THREAD_FUNCTION(notepadThread, param) { selPenWidth = 0; ncoreSetMode(NCORE_MODE_DRAW); - gwinSetColor(nDrawingArea, Black); - gwinSetBgColor(nDrawingArea, White); + gwinSetColor(nDrawingArea, GFX_BLACK); + gwinSetBgColor(nDrawingArea, GFX_WHITE); // Refresh the buttons drawButtons(); |