From 36c55722ddc06af682d7c7bdeb71ba75a3b0fb83 Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Mon, 28 Oct 2013 00:42:38 +0100
Subject: updated GDISP and GWIN demos

---
 demos/modules/gwin/graph/gfxconf.h | 25 +++++++------------------
 demos/modules/gwin/graph/main.c    |  1 +
 2 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'demos/modules/gwin/graph')

diff --git a/demos/modules/gwin/graph/gfxconf.h b/demos/modules/gwin/graph/gfxconf.h
index 51c5bdc4..e829605a 100644
--- a/demos/modules/gwin/graph/gfxconf.h
+++ b/demos/modules/gwin/graph/gfxconf.h
@@ -31,33 +31,22 @@
 #define _GFXCONF_H
 
 /* The operating system to use - one of these must be defined */
-//#define GFX_USE_OS_CHIBIOS		TRUE
-//#define GFX_USE_OS_WIN32		FALSE
-//#define GFX_USE_OS_POSIX		FALSE
+#define GFX_USE_OS_CHIBIOS		FALSE
+#define GFX_USE_OS_WIN32		FALSE
+#define GFX_USE_OS_LINUX		FALSE
+#define GFX_USE_OS_OSX			FALSE
 
 /* GFX sub-systems to turn on */
 #define GFX_USE_GDISP			TRUE
 #define GFX_USE_GWIN			TRUE
-#define GFX_USE_GMISC			TRUE
 
 /* Features for the GDISP sub-system. */
 #define GDISP_NEED_VALIDATION	TRUE
 #define GDISP_NEED_CLIP			TRUE
-#define GDISP_NEED_TEXT			FALSE
-#define GDISP_NEED_CIRCLE		TRUE
-#define GDISP_NEED_ELLIPSE		FALSE
-#define GDISP_NEED_ARC			FALSE
-#define GDISP_NEED_SCROLL		FALSE
-#define GDISP_NEED_PIXELREAD	FALSE
-#define GDISP_NEED_CONTROL		FALSE
-#define GDISP_NEED_MULTITHREAD	FALSE
-#define GDISP_NEED_ASYNC		FALSE
-#define GDISP_NEED_MSGAPI		FALSE
 
-/* Features for the GWIN sub-system. */
+/* Features for the GWIN subsystem. */
+#define GWIN_NEED_WINDOWMANAGER	TRUE
 #define GWIN_NEED_GRAPH			TRUE
 
-/* Turn on fast trig */
-#define GMISC_NEED_FASTTRIG		TRUE
-
 #endif /* _GFXCONF_H */
+
diff --git a/demos/modules/gwin/graph/main.c b/demos/modules/gwin/graph/main.c
index c5b7b352..4dd67ae8 100644
--- a/demos/modules/gwin/graph/main.c
+++ b/demos/modules/gwin/graph/main.c
@@ -100,3 +100,4 @@ int main(void) {
 	}
 }
 
+
-- 
cgit v1.2.3