From 09a359813f0abe8f99c32dadfa1ac2c68356ddfd Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Thu, 4 Jul 2013 00:20:32 +1000
Subject: Label, Image and Window Manager changes

---
 include/gwin/image.h | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

(limited to 'include/gwin/image.h')

diff --git a/include/gwin/image.h b/include/gwin/image.h
index 95a26687..d32e9a0c 100644
--- a/include/gwin/image.h
+++ b/include/gwin/image.h
@@ -32,9 +32,7 @@
 // An image window
 typedef struct GImageWidget_t {
 	GWindowObject	g;
-
-	gdispImage		*image;
-	color_t			bgColor;
+	gdispImage		image;
 } GImageWidget;
 
 #ifdef __cplusplus
@@ -50,11 +48,10 @@ extern "C" {
  * @param[in] pInit		The initialization parameters to use.
  *
  * @note				The default background color gets set to the current default one.
- * @note				An image widget does not save the current drawing state. It is not automatically redrawn if the window
- *						is moved or its visibility state is changed.
+ * @note				An image window knows how to redraw.
  *
  * @api
- */	
+ */
 GHandle gwinImageCreate(GImageWidget *widget, GWindowInit *pInit);
 
 /**
@@ -98,7 +95,7 @@ bool_t gwinImageOpenMemory(GHandle gh, const void* memory);
 #endif
 
 /**
- * @brief				Cache an image.
+ * @brief				Cache the image.
  * @details				Decodes and caches the current frame into RAM.
  *
  * param[in] gh			The widget (must be an image widget)
@@ -109,20 +106,6 @@ bool_t gwinImageOpenMemory(GHandle gh, const void* memory);
  */
 gdispImageError gwinImageCache(GHandle gh);
 
-/**
- * @brief				Set the background color of an image widget.
- * @details				Transparent images need a background color. If no background color has been set, the current default
- *						on is used.
- *
- * @param[in] gh		The widget (must be an image widget)
- * @param[in] bgColor	The background color to be set
- *
- * @api
- */
-void gwinImageSetBgColor(GHandle gh, color_t bgColor);
-
-void gwinImageDraw(GHandle gh);
-
 #ifdef __cplusplus
 }
 #endif
-- 
cgit v1.2.3