diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-04-30 13:41:34 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-04-30 13:41:34 +0200 |
| commit | 33c721c009465dd30d4e96e055a051480c567b57 (patch) | |
| tree | 5a6744a79b7469d80bae474d4314b47d4cd6d44d /gfxconf.example.h | |
| parent | 58cf2d2b35542166f1a4e50a83bcf28ff33574a5 (diff) | |
| parent | a394e2c35dde67241bea69409bcae9f46dcfc089 (diff) | |
| download | uGFX-33c721c009465dd30d4e96e055a051480c567b57.tar.gz uGFX-33c721c009465dd30d4e96e055a051480c567b57.tar.bz2 uGFX-33c721c009465dd30d4e96e055a051480c567b57.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'gfxconf.example.h')
| -rw-r--r-- | gfxconf.example.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gfxconf.example.h b/gfxconf.example.h index e4f9b380..2dcda1c8 100644 --- a/gfxconf.example.h +++ b/gfxconf.example.h @@ -58,9 +58,9 @@ #define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE #define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 FALSE - #define GDISP_INCLUDE_FONT_FIXED_10x20 FALSE - #define GDISP_INCLUDE_FONT_FIXED_7x14 FALSE - #define GDISP_INCLUDE_FONT_FIXED_5x8 FALSE + #define GDISP_INCLUDE_FONT_FIXED_10X20 FALSE + #define GDISP_INCLUDE_FONT_FIXED_7X14 FALSE + #define GDISP_INCLUDE_FONT_FIXED_5X8 FALSE #define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE #define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE #define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE @@ -136,7 +136,9 @@ #define GWIN_NEED_GRAPH FALSE #define GWIN_NEED_WIDGET FALSE + #define GWIN_NEED_HIERARCHY FALSE #define GWIN_NEED_LABEL FALSE + #define GWIN_LABEL_ATTRIBUTE FALSE #define GWIN_NEED_BUTTON FALSE #define GWIN_BUTTON_LAZY_RELEASE FALSE #define GWIN_NEED_SLIDER FALSE @@ -147,6 +149,7 @@ #define GWIN_NEED_LIST FALSE #define GWIN_NEED_LIST_IMAGES FALSE #define GWIN_NEED_PROGRESSBAR FALSE + #define GWIN_NEED_FRAME FALSE /////////////////////////////////////////////////////////////////////////// @@ -176,7 +179,7 @@ #define GQUEUE_NEED_ASYNC FALSE #define GQUEUE_NEED_GSYNC FALSE #define GQUEUE_NEED_FSYNC FALSE - +#define GQUEUE_NEED_BUFFERS FALSE /////////////////////////////////////////////////////////////////////////// // GINPUT // |