updated GDISP and GWIN demos

2 files changed, 45 insertions, 42 deletions

diff --git a/demos/modules/gwin/button/gfxconf.h b/demos/modules/gwin/button/gfxconf.h
index 256ba2ed..6d0aa41d 100644
--- a/demos/modules/gwin/button/gfxconf.h
+++ b/demos/modules/gwin/button/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,35 @@
 #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	FALSE
-#define GDISP_NEED_SCROLL			FALSE
-#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
 
-/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_SMALL		FALSE
-#define GDISP_INCLUDE_FONT_LARGER		FALSE
-#define GDISP_INCLUDE_FONT_UI1			FALSE
-#define GDISP_INCLUDE_FONT_UI2			TRUE
-#define GDISP_INCLUDE_FONT_LARGENUMBERS	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		FALSE
-#define GDISP_NEED_IMAGE_BMP		FALSE
-#define GDISP_NEED_IMAGE_JPG		FALSE
-#define GDISP_NEED_IMAGE_PNG		FALSE
-
-/* Features for the GWIN sub-system. */
+/* Features for the GWIN subsystem. */
 #define GWIN_NEED_WINDOWMANAGER	TRUE
-#define GWIN_NEED_CONSOLE		FALSE
-#define GWIN_NEED_GRAPH			FALSE
 #define GWIN_NEED_WIDGET		TRUE
 #define GWIN_NEED_BUTTON		TRUE
-#define GWIN_NEED_SLIDER		FALSE
-#define GWIN_NEED_CHECKBOX		FALSE
-#define GWIN_NEED_LABEL			FALSE
-#define GWIN_NEED_IMAGE			FALSE
-#define GWIN_NEED_RADIO			FALSE
 
-/* 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
 
 #endif /* _GFXCONF_H */
+
diff --git a/demos/modules/gwin/button/main.c b/demos/modules/gwin/button/main.c
index 1ed2ac43..f210d84c 100644
--- a/demos/modules/gwin/button/main.c
+++ b/demos/modules/gwin/button/main.c
@@ -1,3 +1,32 @@
+/*
+ * 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
+ * modification, are permitted provided that the following conditions are met:
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the name of the <organization> nor the
+ *      names of its contributors may be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "gfx.h"
 
 static GListener gl;