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_keypad.h | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'widget_keypad.h')

diff --git a/widget_keypad.h b/widget_keypad.h
index 5918ede..839e594 100644
--- a/widget_keypad.h
+++ b/widget_keypad.h
@@ -1,4 +1,5 @@
-/* $Id: widget_keypad.h,v 1.3 2006/07/19 01:35:31 cmay Exp $
+/* $Id: widget_keypad.h 748 2007-01-20 05:00:06Z michael $
+ * $URL: https://ssl.bulix.org/svn/lcd4linux/branches/0.10.1/widget_keypad.h $
  *
  * keypad widget handling
  *
@@ -21,25 +22,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *
- * $Log: widget_keypad.h,v $
- * Revision 1.3  2006/07/19 01:35:31  cmay
- * Renamed keypad direction names to avoid conflict with Curses library defs.
- * Added keypad support to Curses display driver.
- *
- * Revision 1.2  2006/02/25 13:36:33  geronet
- * updated indent.sh, applied coding style
- *
- * Revision 1.1  2006/02/21 05:50:34  reinelt
- * keypad support from Cris Maj
- *
- *
  */
 
 
 #ifndef _WIDGET_KEYPAD_H_
 #define _WIDGET_KEYPAD_H_
 
+#include "property.h"
+
 typedef enum {
     WIDGET_KEY_UP = 1,
     WIDGET_KEY_DOWN = 2,
@@ -52,9 +42,7 @@ typedef enum {
 } KEYPADKEY;
 
 typedef struct WIDGET_KEYPAD {
-    char *expression;		/* expression that delivers the value */
-    void *tree;			/* pre-compiled expression that delivers the value */
-    int val;			/* current value of the expression */
+    PROPERTY expression;	/* expression that delivers the value */
     KEYPADKEY key;		/* which key */
 } WIDGET_KEYPAD;
 
-- 
cgit v1.2.3