diff options
Diffstat (limited to 'demos/modules/gwin/label')
| -rw-r--r-- | demos/modules/gwin/label/gfxconf.h | 48 | ||||
| -rw-r--r-- | demos/modules/gwin/label/main.c | 2 |
2 files changed, 25 insertions, 25 deletions
diff --git a/demos/modules/gwin/label/gfxconf.h b/demos/modules/gwin/label/gfxconf.h index 568ea4fe..c84992f1 100644 --- a/demos/modules/gwin/label/gfxconf.h +++ b/demos/modules/gwin/label/gfxconf.h @@ -19,59 +19,59 @@ #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_AUTOFLUSH FALSE -//#define GDISP_NEED_TIMERFLUSH FALSE -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE - #define GDISP_NEED_ANTIALIAS TRUE - #define GDISP_NEED_UTF8 TRUE - #define GDISP_NEED_TEXT_KERNING TRUE - #define GDISP_INCLUDE_FONT_DEJAVUSANS12 TRUE +//#define GDISP_NEED_AUTOFLUSH GFXOFF +//#define GDISP_NEED_TIMERFLUSH GFXOFF +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON + #define GDISP_NEED_ANTIALIAS GFXON + #define GDISP_NEED_UTF8 GFXON + #define GDISP_NEED_TEXT_KERNING GFXON + #define GDISP_INCLUDE_FONT_DEJAVUSANS12 GFXON /////////////////////////////////////////////////////////////////////////// // GWIN // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GWIN TRUE +#define GFX_USE_GWIN GFXON -#define GWIN_NEED_WINDOWMANAGER TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON - #define GWIN_NEED_LABEL TRUE - #define GWIN_LABEL_ATTRIBUTE TRUE + #define GWIN_NEED_LABEL GFXON + #define GWIN_LABEL_ATTRIBUTE 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_ASYNC 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/label/main.c b/demos/modules/gwin/label/main.c index 425436ea..f1fb6b92 100644 --- a/demos/modules/gwin/label/main.c +++ b/demos/modules/gwin/label/main.c @@ -61,7 +61,7 @@ int main(void) { // Set the widget defaults gwinSetDefaultFont(gdispOpenFont("*")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // create the widget createWidgets(); |