From d0c7529cb9833ede3595051df5599a11fe03be48 Mon Sep 17 00:00:00 2001
From: Reinhard Tartler <siretart@tauware.de>
Date: Thu, 5 Apr 2007 15:25:19 +0200
Subject: import new upstream

---
 widget_icon.h | 53 +++++++----------------------------------------------
 1 file changed, 7 insertions(+), 46 deletions(-)

(limited to 'widget_icon.h')

diff --git a/widget_icon.h b/widget_icon.h
index de86798..9f993d1 100644
--- a/widget_icon.h
+++ b/widget_icon.h
@@ -1,4 +1,5 @@
-/* $Id: widget_icon.h,v 1.9 2005/05/08 04:32:45 reinelt Exp $
+/* $Id: widget_icon.h 748 2007-01-20 05:00:06Z michael $
+ * $URL: https://ssl.bulix.org/svn/lcd4linux/branches/0.10.1/widget_icon.h $
  *
  * icon widget handling
  *
@@ -21,58 +22,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *
- * $Log: widget_icon.h,v $
- * Revision 1.9  2005/05/08 04:32:45  reinelt
- * CodingStyle added and applied
- *
- * Revision 1.8  2005/01/18 06:30:24  reinelt
- * added (C) to all copyright statements
- *
- * Revision 1.7  2004/06/26 12:05:00  reinelt
- *
- * uh-oh... the last CVS log message messed up things a lot...
- *
- * Revision 1.6  2004/06/26 09:27:21  reinelt
- *
- * added '-W' to CFLAGS
- * changed all C++ comments to C ones
- * cleaned up a lot of signed/unsigned mistakes
- *
- * Revision 1.5  2004/03/06 20:31:16  reinelt
- * Complete rewrite of the evaluator to get rid of the code
- * from mark Morley (because of license issues).
- * The new Evaluator does a pre-compile of expressions, and
- * stores them in trees. Therefore it should be reasonable faster...
- *
- * Revision 1.4  2004/02/15 21:43:43  reinelt
- * T6963 driver nearly finished
- * framework for graphic displays done
- * i2c_sensors patch from Xavier
- * some more old generation files removed
- *
- * Revision 1.3  2004/02/04 19:11:44  reinelt
- * icon visibility patch from Xavier
- *
- * Revision 1.2  2004/01/23 07:04:39  reinelt
- * icons finished!
- *
- * Revision 1.1  2004/01/23 04:54:04  reinelt
- * icon widget added (not finished yet!)
- *
  */
 
 
 #ifndef _WIDGET_ICON_H_
 #define _WIDGET_ICON_H_
 
+#include "property.h"
+
 typedef struct WIDGET_ICON {
-    char *speed_expr;		/* expression for update interval */
-    void *speed_tree;		/* pre-compiled expression for update interval */
-    int speed;			/* update interval (msec) */
-    char *visible_expr;		/* expression for visibility */
-    void *visible_tree;		/* pre-compiled expression for visibility */
-    int visible;		/* icon visible? */
+    PROPERTY speed;		/* update interval (msec) */
+    PROPERTY visible;		/* icon visible? */
     int ascii;			/* ascii code of icon (depends on the driver) */
     int curmap;			/* current bitmap sequence */
     int prvmap;			/* previous bitmap sequence  */
@@ -80,6 +40,7 @@ typedef struct WIDGET_ICON {
     unsigned char *bitmap;	/* bitmaps of (animated) icon */
 } WIDGET_ICON;
 
+
 extern WIDGET_CLASS Widget_Icon;
 
 #endif
-- 
cgit v1.2.3