From d60706032eed1d30d3546b39ff631013d1691251 Mon Sep 17 00:00:00 2001 From: inmarket Date: Fri, 27 Nov 2015 10:16:40 +1000 Subject: Fix frame demo so that malloc is emulated as rand() needs it on some platforms --- demos/modules/gwin/frame/gfxconf.h | 3 +++ demos/modules/gwin/frame/main.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'demos') 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 static GListener gl; static GHandle ghFrame1; -- cgit v1.2.3 From 627e780b6c96de1dc88b52abeb765f385afb6d96 Mon Sep 17 00:00:00 2001 From: inmarket Date: Fri, 27 Nov 2015 10:17:14 +1000 Subject: Make no hardware keyboard the default for the textedit demo --- demos/modules/gwin/textedit/gfxconf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'demos') 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 -- cgit v1.2.3