From fe6708c7a284fcd17082ef1b59ead564db47bcbc Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Wed, 19 Feb 2014 00:23:07 +1000
Subject: [PATCH] Demo updates to fix compile issues.

---
 demos/3rdparty/bubbles/main.c        | 8 ++++----
 demos/applications/notepad/gfxconf.h | 1 -
 demos/applications/notepad/main.c    | 1 -
 demos/modules/gwin/checkbox/main.c   | 2 +-
 demos/modules/gwin/graph/gfxconf.h   | 4 ++++
 demos/modules/gwin/list/gfxconf.h    | 1 +
 demos/modules/gwin/radio/main.c      | 2 +-
 demos/modules/gwin/slider/main.c     | 2 +-
 8 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/demos/3rdparty/bubbles/main.c b/demos/3rdparty/bubbles/main.c
index 62ef2830..f167b536 100644
--- a/demos/3rdparty/bubbles/main.c
+++ b/demos/3rdparty/bubbles/main.c
@@ -60,7 +60,7 @@ void matrix (int16_t xyz[3][N], color_t col[N])
       xyz[0][i] = x;
       xyz[1][i] = y;
 
-      d = sqrtf(x * x + y * y);	/* originally a fastsqrt() call */
+      d = sqrt(x * x + y * y);	/* originally a fastsqrt() call */
       s = sine[(t * 30) % SCALE] + SCALE;
 
       xyz[2][i] = sine[(d + s) % SCALE] * sine[(t * 10) % SCALE] / SCALE / 2;
@@ -151,11 +151,11 @@ int main (void)
 
   gfxInit();
 
-  chThdSleepMilliseconds (10);
+  gfxSleepMilliseconds (10);
   gdispClear (background); /* glitches.. */
-  chThdSleepMilliseconds (10);
+  gfxSleepMilliseconds (10);
   gdispClear (background);  /* glitches.. */
-  chThdSleepMilliseconds (10);
+  gfxSleepMilliseconds (10);
   gdispClear (background);  /* glitches.. */
 
   width = (uint16_t)gdispGetWidth();
diff --git a/demos/applications/notepad/gfxconf.h b/demos/applications/notepad/gfxconf.h
index 7ffb22fa..b3920119 100644
--- a/demos/applications/notepad/gfxconf.h
+++ b/demos/applications/notepad/gfxconf.h
@@ -47,7 +47,6 @@
 #define GDISP_NEED_CLIP			TRUE
 #define GDISP_NEED_TEXT			TRUE
 #define GDISP_NEED_CIRCLE		TRUE
-#define GDISP_NEED_CONTROL		TRUE
 #define GDISP_NEED_MULTITHREAD	TRUE
 
 /* Builtin Fonts */
diff --git a/demos/applications/notepad/main.c b/demos/applications/notepad/main.c
index d2d53464..fb10e86b 100644
--- a/demos/applications/notepad/main.c
+++ b/demos/applications/notepad/main.c
@@ -79,7 +79,6 @@ int main(void) {
 
 	gfxInit();
 	ginputGetMouse(0);
-	gdispSetOrientation(GDISP_ROTATE_90);
 
 	drawScreen();
 
diff --git a/demos/modules/gwin/checkbox/main.c b/demos/modules/gwin/checkbox/main.c
index 51f96518..b6cef40b 100644
--- a/demos/modules/gwin/checkbox/main.c
+++ b/demos/modules/gwin/checkbox/main.c
@@ -81,7 +81,7 @@ int main(void) {
 			case GEVENT_GWIN_CHECKBOX:
 				if (((GEventGWinCheckbox*)pe)->checkbox == ghCheckbox1) {
 					// The state of our checkbox has changed
-					printf("Checkbox state: %d\r\n", ((GEventGWinCheckbox*)pe)->isChecked);
+					//printf("Checkbox state: %d\r\n", ((GEventGWinCheckbox*)pe)->isChecked);
 				}
 				break;
 
diff --git a/demos/modules/gwin/graph/gfxconf.h b/demos/modules/gwin/graph/gfxconf.h
index c09bfc6e..bc65beea 100644
--- a/demos/modules/gwin/graph/gfxconf.h
+++ b/demos/modules/gwin/graph/gfxconf.h
@@ -39,6 +39,7 @@
 /* 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
@@ -48,5 +49,8 @@
 #define GWIN_NEED_WINDOWMANAGER	TRUE
 #define GWIN_NEED_GRAPH			TRUE
 
+/* Features for the GMISC subsystem. */
+#define GMISC_NEED_FASTTRIG		TRUE
+
 #endif /* _GFXCONF_H */
 
diff --git a/demos/modules/gwin/list/gfxconf.h b/demos/modules/gwin/list/gfxconf.h
index ebd35f05..505ff2cc 100644
--- a/demos/modules/gwin/list/gfxconf.h
+++ b/demos/modules/gwin/list/gfxconf.h
@@ -43,6 +43,7 @@
 
 #define GWIN_NEED_WINDOWMANAGER                      TRUE
 #define GWIN_NEED_WIDGET                             TRUE
+    #define GWIN_NEED_LABEL                          TRUE
     #define GWIN_NEED_LIST                           TRUE
         #define GWIN_NEED_LIST_IMAGES                TRUE
 
diff --git a/demos/modules/gwin/radio/main.c b/demos/modules/gwin/radio/main.c
index 9287dcf9..a3c493c3 100644
--- a/demos/modules/gwin/radio/main.c
+++ b/demos/modules/gwin/radio/main.c
@@ -101,7 +101,7 @@ int main(void) {
 
 		switch(pe->type) {
 			case GEVENT_GWIN_RADIO:
-				printf("group: %u   radio: %s\n", ((GEventGWinRadio *)pe)->group, gwinGetText(((GEventGWinRadio *)pe)->radio));
+				//printf("group: %u   radio: %s\n", ((GEventGWinRadio *)pe)->group, gwinGetText(((GEventGWinRadio *)pe)->radio));
 				break;
 
 			default:
diff --git a/demos/modules/gwin/slider/main.c b/demos/modules/gwin/slider/main.c
index 6e72b447..0897f1f3 100644
--- a/demos/modules/gwin/slider/main.c
+++ b/demos/modules/gwin/slider/main.c
@@ -77,7 +77,7 @@ int main(void) {
 
 		switch(pe->type) {
 			case GEVENT_GWIN_SLIDER:
-				printf("Slider %s = %d\n", gwinGetText(((GEventGWinSlider *)pe)->slider), ((GEventGWinSlider *)pe)->position);
+				//printf("Slider %s = %d\n", gwinGetText(((GEventGWinSlider *)pe)->slider), ((GEventGWinSlider *)pe)->position);
 				break;
 
 			default: