From 192335ea3595a2c162857a6a1eebb672f82bf180 Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Mon, 6 Jan 2014 21:54:13 +0100
Subject: doc

---
 include/gdisp/gdisp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/gdisp/gdisp.h b/include/gdisp/gdisp.h
index 8f379bfd..d1d78145 100644
--- a/include/gdisp/gdisp.h
+++ b/include/gdisp/gdisp.h
@@ -681,8 +681,8 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
 	 *
 	 * @param[in] g 		The display to use
 	 * @param[in] x,y		The position for the text
-	 * @param[in] font		The font to use
 	 * @param[in] str		The string to draw
+	 * @param[in] font		The font to use
 	 * @param[in] color		The color to use
 	 *
 	 * @api
-- 
cgit v1.2.3


From ac98de6b6934dffeee87d2cd6329d3504d2332d4 Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Mon, 6 Jan 2014 22:06:36 +0100
Subject: added gwinGetColor() and gwinGetBgColor()

---
 include/gwin/gwin.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'include')

diff --git a/include/gwin/gwin.h b/include/gwin/gwin.h
index 96055376..e964bc3a 100644
--- a/include/gwin/gwin.h
+++ b/include/gwin/gwin.h
@@ -275,6 +275,24 @@ extern "C" {
 	 */
 	#define gwinSetBgColor(gh, bgclr)	(gh)->bgcolor = (bgclr)
 
+	/**
+	 * @brief	Get the foreground color of a window
+	 *
+	 * @param[in] gh	The window
+	 *
+	 * @api
+	 */
+	#define gwinGetColor(gh)			(gh)->color
+
+	/**
+	 * @brief	Get the background color of a window
+	 *
+	 * @param[in] gh	The window
+	 *
+	 * @api
+	 */
+	#define gwinGetBgColor(gh)			(gh)->bgcolor
+
 	/**
 	 * @brief	Sets whether a window is visible or not
 	 *
-- 
cgit v1.2.3