From 15e7342fd7b21b76a565561a3caafee394e70c88 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Sun, 16 Aug 2015 21:53:47 +1000
Subject: Updates to focus.

---
 demos/modules/gwin/textedit/gfxconf.h | 8 +++++++-
 demos/modules/gwin/widgets/main.c     | 7 ++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'demos/modules/gwin')

diff --git a/demos/modules/gwin/textedit/gfxconf.h b/demos/modules/gwin/textedit/gfxconf.h
index 4e518774..3c5d7b96 100644
--- a/demos/modules/gwin/textedit/gfxconf.h
+++ b/demos/modules/gwin/textedit/gfxconf.h
@@ -48,13 +48,15 @@
 #define GDISP_NEED_CLIP			TRUE
 #define GDISP_NEED_TEXT			TRUE
 #define GDISP_NEED_TEXT_KERNING	TRUE
-#define GDISP_NEED_STARTUP_LOGO	TRUE
+#define GDISP_NEED_MULTITHREAD  TRUE
 
 /* GDISP fonts to include */
 #define GDISP_INCLUDE_FONT_UI2	TRUE
 #define GDISP_INCLUDE_FONT_DEJAVUSANS16	TRUE
 
 /* Features for the GWIN subsystem. */
+#define GWIN_NEED_WINDOWMANAGER TRUE
+#define GWIN_NEED_WIDGET        TRUE
 #define GWIN_NEED_CONSOLE		TRUE
 #define GWIN_NEED_TEXTEDIT		TRUE
 #define GWIN_NEED_BUTTON		TRUE
@@ -63,5 +65,9 @@
 #define GINPUT_NEED_MOUSE		TRUE
 #define GINPUT_NEED_KEYBOARD	TRUE
 
+/* Features for the GQUEUE subsystem. */
+#define GFX_USE_GQUEUE                               TRUE
+#define GQUEUE_NEED_ASYNC                            TRUE
+
 #endif /* _GFXCONF_H */
 
diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c
index d5bfb6d2..8f5a6329 100644
--- a/demos/modules/gwin/widgets/main.c
+++ b/demos/modules/gwin/widgets/main.c
@@ -49,13 +49,14 @@
 /* Our custom yellow style */
 static const GWidgetStyle YellowWidgetStyle = {
 	Yellow,							// window background
+	HTML2COLOR(0x800000),			// focus
 
 	// enabled color set
 	{
 		HTML2COLOR(0x0000FF),		// text
 		HTML2COLOR(0x404040),		// edge
 		HTML2COLOR(0xE0E0E0),		// fill
-		HTML2COLOR(0xE0E0E0),		// progress - inactive area
+		HTML2COLOR(0xE0E0E0)		// progress - inactive area
 	},
 
 	// disabled color set
@@ -63,7 +64,7 @@ static const GWidgetStyle YellowWidgetStyle = {
 		HTML2COLOR(0xC0C0C0),		// text
 		HTML2COLOR(0x808080),		// edge
 		HTML2COLOR(0xE0E0E0),		// fill
-		HTML2COLOR(0xC0E0C0),		// progress - active area
+		HTML2COLOR(0xC0E0C0)		// progress - active area
 	},
 
 	// pressed color set
@@ -72,7 +73,7 @@ static const GWidgetStyle YellowWidgetStyle = {
 		HTML2COLOR(0x404040),		// edge
 		HTML2COLOR(0x808080),		// fill
 		HTML2COLOR(0x00E000),		// progress - active area
-	},
+	}
 };
 
 /* The variables we need */
-- 
cgit v1.2.3