updated GDISP and GWIN demos

1 files changed, 23 insertions, 32 deletions

diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h
index 0bf8443a..ed6be366 100644
--- a/demos/modules/gwin/widgets/gfxconf.h
+++ b/demos/modules/gwin/widgets/gfxconf.h
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
  * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket
+ *
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,62 +30,52 @@
 #ifndef _GFXCONF_H
 #define _GFXCONF_H
 
-//#define GFX_USE_OS_CHIBIOS		TRUE
-//#define GFX_USE_OS_WIN32		TRUE
-//#define GFX_USE_OS_POSIX		TRUE
+/* The operating system to use - one of these must be defined */
+#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_GINPUT			TRUE
 #define GFX_USE_GEVENT			TRUE
 #define GFX_USE_GTIMER			TRUE
-#define GFX_USE_GINPUT			TRUE
 
 /* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION		TRUE
-#define GDISP_NEED_CLIP				TRUE
-#define GDISP_NEED_TEXT				TRUE
-#define GDISP_NEED_CIRCLE			TRUE
-#define GDISP_NEED_ELLIPSE			FALSE
-#define GDISP_NEED_ARC				FALSE
-#define GDISP_NEED_CONVEX_POLYGON	TRUE
-#define GDISP_NEED_SCROLL			TRUE
-#define GDISP_NEED_PIXELREAD		FALSE
-#define GDISP_NEED_CONTROL			FALSE
-#define GDISP_NEED_IMAGE			TRUE
-#define GDISP_NEED_MULTITHREAD		TRUE
-#define GDISP_NEED_ASYNC			FALSE
-#define GDISP_NEED_MSGAPI			FALSE
+#define GDISP_NEED_VALIDATION	TRUE
+#define GDISP_NEED_CLIP			TRUE
+#define GDISP_NEED_CIRCLE		TRUE
+#define GDISP_NEED_TEXT			TRUE
+#define GDISP_NEED_SCROLL		TRUE
+#define GDISP_NEED_IMAGE		TRUE
 
-/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_UI2		TRUE
-#define GDISP_NEED_ANTIALIAS		FALSE
+/* GDISP fonts to include */
+#define GDISP_INCLUDE_FONT_UI2	TRUE
 
 /* GDISP image decoders */
-#define GDISP_NEED_IMAGE_NATIVE		FALSE
 #define GDISP_NEED_IMAGE_GIF		TRUE
-#define GDISP_NEED_IMAGE_BMP		FALSE
-#define GDISP_NEED_IMAGE_JPG		FALSE
-#define GDISP_NEED_IMAGE_PNG		FALSE
+#define GDISP_NEED_IMAGE_BMP		TRUE
 
-/* Features for the GWIN sub-system. */
+/* Features for the GWIN subsystem. */
 #define GWIN_NEED_WINDOWMANAGER	TRUE
 #define GWIN_NEED_CONSOLE		TRUE
 #define GWIN_NEED_GRAPH			TRUE
 #define GWIN_NEED_WIDGET		TRUE
+#define GWIN_NEED_LABEL			TRUE
 #define GWIN_NEED_BUTTON		TRUE
 #define GWIN_NEED_SLIDER		TRUE
 #define GWIN_NEED_CHECKBOX		TRUE
-#define GWIN_NEED_LABEL			TRUE
 #define GWIN_NEED_IMAGE			TRUE
 #define GWIN_NEED_RADIO			TRUE
 #define GWIN_NEED_LIST			TRUE
-#define GWIN_NEED_IMAGE_ANIMATION	TRUE
-#define GWIN_NEED_LIST_IMAGES		TRUE
 
-/* Features for the GINPUT sub-system. */
+/* Features for the GINPUT subsystem. */
 #define GINPUT_NEED_MOUSE		TRUE
-#define GINPUT_NEED_TOGGLE		FALSE
-#define GINPUT_NEED_DIAL		FALSE
+
+/* Optional parameters for various subsystems */
+#define GWIN_NEED_LIST_IMAGES	TRUE
 
 #endif /* _GFXCONF_H */
+