diff options
| author | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-11-27 20:39:28 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-11-27 20:39:28 +0100 |
| commit | 5a99092b794373966e444296c57991631e712c70 (patch) | |
| tree | 3e2853ab9730ece7398f508238ac2707e485b346 /demos | |
| parent | eaf0b19fb8428b9e2e47798294d6ba83a56d186e (diff) | |
| parent | f16ee702727a811288749a0722ddb138dd559fa8 (diff) | |
| download | uGFX-5a99092b794373966e444296c57991631e712c70.tar.gz uGFX-5a99092b794373966e444296c57991631e712c70.tar.bz2 uGFX-5a99092b794373966e444296c57991631e712c70.zip | |
Merge branch 'master' of https://bitbucket.org/Tectu/ugfx
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/modules/gwin/frame/gfxconf.h | 3 | ||||
| -rw-r--r-- | demos/modules/gwin/frame/main.c | 2 | ||||
| -rw-r--r-- | demos/modules/gwin/textedit/gfxconf.h | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/demos/modules/gwin/frame/gfxconf.h b/demos/modules/gwin/frame/gfxconf.h index c6dcd80f..0c14f6b4 100644 --- a/demos/modules/gwin/frame/gfxconf.h +++ b/demos/modules/gwin/frame/gfxconf.h @@ -24,6 +24,9 @@ //#define GFX_USE_OS_LINUX TRUE //#define GFX_USE_OS_OSX TRUE +// Oops - rand() seems to use malloc() +#define GFX_EMULATE_MALLOC TRUE + /////////////////////////////////////////////////////////////////////////// // GDISP // /////////////////////////////////////////////////////////////////////////// diff --git a/demos/modules/gwin/frame/main.c b/demos/modules/gwin/frame/main.c index a97525ab..6668ddbb 100644 --- a/demos/modules/gwin/frame/main.c +++ b/demos/modules/gwin/frame/main.c @@ -1,5 +1,5 @@ #include "gfx.h" -#include "stdio.h" +#include <stdlib.h> static GListener gl; static GHandle ghFrame1; diff --git a/demos/modules/gwin/textedit/gfxconf.h b/demos/modules/gwin/textedit/gfxconf.h index 4faaae82..263ae035 100644 --- a/demos/modules/gwin/textedit/gfxconf.h +++ b/demos/modules/gwin/textedit/gfxconf.h @@ -65,8 +65,8 @@ #define GINPUT_NEED_MOUSE TRUE /* One or both of these */ -#define GINPUT_NEED_KEYBOARD TRUE -#define GWIN_NEED_KEYBOARD TRUE +//#define GINPUT_NEED_KEYBOARD TRUE +#define GWIN_NEED_KEYBOARD TRUE /* Features for the GQUEUE subsystem. */ #define GFX_USE_GQUEUE TRUE |