From 3f80e1f89dbeec06dd97a914d6851ad4596b1743 Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Tue, 2 Jul 2013 19:26:48 +0200
Subject: label work in progress - not working anymore

---
 include/gwin/gwin.h    | 10 +++++++++-
 include/gwin/label.h   | 11 ++---------
 include/gwin/options.h | 14 ++++++++++++++
 3 files changed, 25 insertions(+), 10 deletions(-)

(limited to 'include/gwin')

diff --git a/include/gwin/gwin.h b/include/gwin/gwin.h
index 10aabf6f..21d465b2 100644
--- a/include/gwin/gwin.h
+++ b/include/gwin/gwin.h
@@ -129,8 +129,16 @@ extern "C" {
 		 * @api
 		 */
 		void gwinSetDefaultFont(font_t font);
-	#endif
 
+		/**
+		 * @brief	Get the current default font
+		 *
+		 * @return	The current default font
+		 *
+		 * @api
+		 */
+		font_t gwinGetDefaultFont(void);
+	#endif
 
 /*-------------------------------------------------
  * Base functions
diff --git a/include/gwin/label.h b/include/gwin/label.h
index ed774ed7..d387345d 100644
--- a/include/gwin/label.h
+++ b/include/gwin/label.h
@@ -31,9 +31,7 @@
 
 // An label window
 typedef struct GLabelWidget_t {
-	GWindowObject	g;
-
-	const char*		text;
+	GWidgetObject	w;
 } GLabelWidget;
 
 #ifdef __cplusplus
@@ -51,12 +49,7 @@ extern "C" {
  *
  * @api
  */
-GHandle gwinLabelCreate(GLabelWidget *widget, GWindowInit *pInit);
-void gwinLabelSetColor(GHandle gh, color_t color);
-void gwinLabelSetBgColor(GHandle gh, color_t bgColor);
-void gwinLabelSetFont(GHandle gh, font_t font);
-void gwinLabelSetText(GHandle gh, const char* text);
-void gwinLabelDraw(GHandle gh);
+GHandle gwinLabelCreate(GLabelWidget *widget, GWidgetInit *pInit);
 
 #ifdef __cplusplus
 }
diff --git a/include/gwin/options.h b/include/gwin/options.h
index cc164259..11ab7d44 100644
--- a/include/gwin/options.h
+++ b/include/gwin/options.h
@@ -69,6 +69,20 @@
 	#ifndef GWIN_NEED_CHECKBOX
 		#define GWIN_NEED_CHECKBOX	FALSE
 	#endif
+	/**
+	 * @brief   Should image functions be included.
+	 * @details	Defaults to FALSE
+	 */
+	#ifndef GWIN_NEED_IMAGE
+		#define GWIN_NEED_IMAGE		FALSE
+	#endif
+	/**
+	 * @brief   Should label functions be included.
+	 * @details	Defaults to FALSE
+	 */
+	#ifndef GWIN_NEED_LABEL
+		#define GWIN_NEED_LABEL		FALSE
+	#endif
 /**
  * @}
  *
-- 
cgit v1.2.3