From bbdbd637f00348357fb7919adfe8a3f406f1451d Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Sat, 17 Aug 2013 23:35:18 +1000
Subject: [PATCH] Update old demos for new fonts.

---
 demos/modules/gdisp/gdisp_text/gfxconf.h | 26 +++++++++++++++++++++---
 demos/modules/gwin/console/gfxconf.h     |  8 ++++----
 demos/modules/gwin/console/main.c        |  2 +-
 demos/modules/gwin/widgets/gfxconf.h     |  4 ++--
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/demos/modules/gdisp/gdisp_text/gfxconf.h b/demos/modules/gdisp/gdisp_text/gfxconf.h
index e7fd0eb6..76127ef9 100644
--- a/demos/modules/gdisp/gdisp_text/gfxconf.h
+++ b/demos/modules/gdisp/gdisp_text/gfxconf.h
@@ -31,9 +31,9 @@
 #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_POSIX		FALSE
 
 /* GFX sub-systems to turn on */
 #define GFX_USE_GDISP			TRUE
@@ -52,4 +52,24 @@
 #define GDISP_NEED_ASYNC		FALSE
 #define GDISP_NEED_MSGAPI		FALSE
 
+/* GDISP - fonts to include */
+#define GDISP_INCLUDE_FONT_DEJAVUSANS10			FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12			FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16			FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS24			FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS32			FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12		FALSE
+#define GDISP_INCLUDE_FONT_FIXED_10x20			FALSE
+#define GDISP_INCLUDE_FONT_FIXED_7x14			FALSE
+#define GDISP_INCLUDE_FONT_FIXED_5x8			FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA		FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA		FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA		FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA		FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA	FALSE
+
+#define GDISP_INCLUDE_FONT_UI1					FALSE
+#define GDISP_INCLUDE_FONT_UI2					TRUE
+#define GDISP_INCLUDE_FONT_LARGENUMBERS			TRUE
+
 #endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/console/gfxconf.h b/demos/modules/gwin/console/gfxconf.h
index 97a26438..90dbc7cb 100644
--- a/demos/modules/gwin/console/gfxconf.h
+++ b/demos/modules/gwin/console/gfxconf.h
@@ -31,9 +31,9 @@
 #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_POSIX		FALSE
 
 /* GFX sub-systems to turn on */
 #define GFX_USE_GDISP			TRUE
@@ -54,7 +54,7 @@
 #define GDISP_NEED_MSGAPI		FALSE
 
 /* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_SMALL		TRUE
+#define GDISP_INCLUDE_FONT_SMALL		FALSE
 #define GDISP_INCLUDE_FONT_LARGER		FALSE
 #define GDISP_INCLUDE_FONT_UI1			FALSE
 #define GDISP_INCLUDE_FONT_UI2			TRUE
diff --git a/demos/modules/gwin/console/main.c b/demos/modules/gwin/console/main.c
index 197a8ad6..2175ce04 100644
--- a/demos/modules/gwin/console/main.c
+++ b/demos/modules/gwin/console/main.c
@@ -40,7 +40,7 @@ int main(void) {
 	gfxInit();
 
 	/* Set some fonts */
-	font1 = gdispOpenFont("Small");
+	font1 = gdispOpenFont("UI2");
 	font2 = gdispOpenFont("UI2 Double");
 	gwinSetDefaultFont(font1);
 
diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h
index 4fdcf212..50fcbf58 100644
--- a/demos/modules/gwin/widgets/gfxconf.h
+++ b/demos/modules/gwin/widgets/gfxconf.h
@@ -57,8 +57,8 @@
 #define GDISP_NEED_MSGAPI			FALSE
 
 /* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12		TRUE
-#define GDISP_NEED_ANTIALIAS		TRUE
+#define GDISP_INCLUDE_FONT_UI2		TRUE
+#define GDISP_NEED_ANTIALIAS		FALSE
 
 /* GDISP image decoders */
 #define GDISP_NEED_IMAGE_NATIVE		FALSE