diff options
Diffstat (limited to 'demos/modules/gwin/keyboard')
| -rw-r--r-- | demos/modules/gwin/keyboard/gfxconf.h | 48 | ||||
| -rw-r--r-- | demos/modules/gwin/keyboard/main.c | 4 |
2 files changed, 26 insertions, 26 deletions
diff --git a/demos/modules/gwin/keyboard/gfxconf.h b/demos/modules/gwin/keyboard/gfxconf.h index bfae0e7c..79d443dc 100644 --- a/demos/modules/gwin/keyboard/gfxconf.h +++ b/demos/modules/gwin/keyboard/gfxconf.h @@ -19,37 +19,37 @@ #define _GFXCONF_H /* The operating system to use. One of these must be defined - preferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS TRUE -//#define GFX_USE_OS_WIN32 TRUE -//#define GFX_USE_OS_LINUX TRUE -//#define GFX_USE_OS_OSX TRUE +//#define GFX_USE_OS_CHIBIOS GFXON +//#define GFX_USE_OS_WIN32 GFXON +//#define GFX_USE_OS_LINUX GFXON +//#define GFX_USE_OS_OSX GFXON -#define GFX_USE_GDISP TRUE +#define GFX_USE_GDISP GFXON -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -//#define GDISP_NEED_SCROLL TRUE -#define GDISP_NEED_TEXT TRUE - #define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +//#define GDISP_NEED_SCROLL GFXON +#define GDISP_NEED_TEXT GFXON + #define GDISP_INCLUDE_FONT_UI2 GFXON -//#define GDISP_NEED_CONTROL TRUE +//#define GDISP_NEED_CONTROL GFXON //#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE -#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_NEED_MULTITHREAD GFXON -#define GFX_USE_GWIN TRUE -#define GWIN_NEED_WINDOWMANAGER TRUE -#define GWIN_NEED_CONSOLE TRUE -#define GWIN_NEED_WIDGET TRUE - #define GWIN_NEED_KEYBOARD TRUE +#define GFX_USE_GWIN GFXON +#define GWIN_NEED_WINDOWMANAGER GFXON +#define GWIN_NEED_CONSOLE GFXON +#define GWIN_NEED_WIDGET GFXON + #define GWIN_NEED_KEYBOARD GFXON -#define GFX_USE_GEVENT TRUE -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GEVENT GFXON +#define GFX_USE_GTIMER GFXON -#define GFX_USE_GQUEUE TRUE -#define GQUEUE_NEED_ASYNC TRUE +#define GFX_USE_GQUEUE GFXON +#define GQUEUE_NEED_ASYNC GFXON -#define GFX_USE_GINPUT TRUE -#define GINPUT_NEED_MOUSE TRUE -//#define GINPUT_NEED_KEYBOARD TRUE +#define GFX_USE_GINPUT GFXON +#define GINPUT_NEED_MOUSE GFXON +//#define GINPUT_NEED_KEYBOARD GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/keyboard/main.c b/demos/modules/gwin/keyboard/main.c index 47a10fc0..d81ac6a3 100644 --- a/demos/modules/gwin/keyboard/main.c +++ b/demos/modules/gwin/keyboard/main.c @@ -47,7 +47,7 @@ static void createWidgets(void) { wi.g.x = 0; wi.g.y = 0; wi.g.width = gdispGetWidth(); wi.g.height = gdispGetHeight()/2; ghConsole = gwinConsoleCreate(0, &wi.g); - gwinSetColor(ghConsole, Black); + gwinSetColor(ghConsole, GFX_BLACK); gwinSetBgColor(ghConsole, HTML2COLOR(0xF0F0F0)); gwinShow(ghConsole); gwinClear(ghConsole); @@ -71,7 +71,7 @@ int main(void) { font = gdispOpenFont("*"); // Get the first defined font. gwinSetDefaultFont(font); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // Create the gwin windows/widgets createWidgets(); |