diff options
Diffstat (limited to 'demos/modules/gwin/container')
| -rw-r--r-- | demos/modules/gwin/container/gfxconf.h | 68 | ||||
| -rw-r--r-- | demos/modules/gwin/container/main.c | 2 |
2 files changed, 35 insertions, 35 deletions
diff --git a/demos/modules/gwin/container/gfxconf.h b/demos/modules/gwin/container/gfxconf.h index fdddc3f3..e37c8653 100644 --- a/demos/modules/gwin/container/gfxconf.h +++ b/demos/modules/gwin/container/gfxconf.h @@ -19,69 +19,69 @@ #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 /////////////////////////////////////////////////////////////////////////// // GDISP // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GDISP TRUE +#define GFX_USE_GDISP GFXON -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE - #define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON + #define GDISP_INCLUDE_FONT_UI2 GFXON +#define GDISP_NEED_MULTITHREAD GFXON /////////////////////////////////////////////////////////////////////////// // GWIN // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GWIN TRUE - -#define GWIN_NEED_WINDOWMANAGER TRUE - -#define GWIN_NEED_CONSOLE TRUE - #define GWIN_CONSOLE_USE_HISTORY TRUE - #define GWIN_CONSOLE_HISTORY_AVERAGING TRUE - #define GWIN_CONSOLE_HISTORY_ATCREATE TRUE - #define GWIN_CONSOLE_ESCSEQ TRUE - #define GWIN_CONSOLE_USE_BASESTREAM TRUE -#define GWIN_NEED_GRAPH TRUE - -#define GWIN_NEED_WIDGET TRUE - #define GWIN_NEED_BUTTON TRUE - #define GWIN_BUTTON_LAZY_RELEASE TRUE -#define GWIN_NEED_CONTAINERS TRUE - #define GWIN_NEED_CONTAINER TRUE +#define GFX_USE_GWIN GFXON + +#define GWIN_NEED_WINDOWMANAGER GFXON + +#define GWIN_NEED_CONSOLE GFXON + #define GWIN_CONSOLE_USE_HISTORY GFXON + #define GWIN_CONSOLE_HISTORY_AVERAGING GFXON + #define GWIN_CONSOLE_HISTORY_ATCREATE GFXON + #define GWIN_CONSOLE_ESCSEQ GFXON + #define GWIN_CONSOLE_USE_BASESTREAM GFXON +#define GWIN_NEED_GRAPH GFXON + +#define GWIN_NEED_WIDGET GFXON + #define GWIN_NEED_BUTTON GFXON + #define GWIN_BUTTON_LAZY_RELEASE GFXON +#define GWIN_NEED_CONTAINERS GFXON + #define GWIN_NEED_CONTAINER GFXON /////////////////////////////////////////////////////////////////////////// // GEVENT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GEVENT TRUE +#define GFX_USE_GEVENT GFXON /////////////////////////////////////////////////////////////////////////// // GTIMER // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GTIMER GFXON /////////////////////////////////////////////////////////////////////////// // GQUEUE // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GQUEUE TRUE +#define GFX_USE_GQUEUE GFXON -#define GQUEUE_NEED_ASYNC TRUE -#define GQUEUE_NEED_GSYNC TRUE +#define GQUEUE_NEED_ASYNC GFXON +#define GQUEUE_NEED_GSYNC GFXON /////////////////////////////////////////////////////////////////////////// // GINPUT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GINPUT TRUE +#define GFX_USE_GINPUT GFXON -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/container/main.c b/demos/modules/gwin/container/main.c index 75e3f78b..af2e8b1f 100644 --- a/demos/modules/gwin/container/main.c +++ b/demos/modules/gwin/container/main.c @@ -40,7 +40,7 @@ int main(void) { // Set the widget defaults gwinSetDefaultFont(gdispOpenFont("*")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // Create the widget createWidgets(); |