diff options
author | cmay <> | 2006-02-21 15:55:59 +0000 |
---|---|---|
committer | cmay <> | 2006-02-21 15:55:59 +0000 |
commit | 55f062f9ccc5ccfead277b72262fc0e0f3a8f415 (patch) | |
tree | 8f815d007711d1ba18bfbcf060d0b86984fdd5aa /widget_keypad.c | |
parent | eefaa2aeda11bb5c505718c5700f0db9a4994636 (diff) | |
download | lcd4linux-55f062f9ccc5ccfead277b72262fc0e0f3a8f415.tar.gz |
[lcd4linux @ 2006-02-21 15:55:59 by cmay]
removed new update function for keypad, consolidated it with draw
Diffstat (limited to 'widget_keypad.c')
-rw-r--r-- | widget_keypad.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/widget_keypad.c b/widget_keypad.c index 8c278b1..d0de69f 100644 --- a/widget_keypad.c +++ b/widget_keypad.c @@ -1,4 +1,4 @@ -/* $Id: widget_keypad.c,v 1.1 2006/02/21 05:50:34 reinelt Exp $ +/* $Id: widget_keypad.c,v 1.2 2006/02/21 15:55:59 cmay Exp $ * * keypad widget handling * @@ -21,6 +21,9 @@ * * * $Log: widget_keypad.c,v $ + * Revision 1.2 2006/02/21 15:55:59 cmay + * removed new update function for keypad, consolidated it with draw + * * Revision 1.1 2006/02/21 05:50:34 reinelt * keypad support from Cris Maj * @@ -55,10 +58,9 @@ #endif -void widget_keypad_update(void *Self) +int widget_keypad_draw(WIDGET * Self) { - WIDGET *W = (WIDGET *) Self; - WIDGET_KEYPAD *keypad = W->data; + WIDGET_KEYPAD *keypad = Self->data; RESULT result = { 0, 0, 0, NULL }; int val; @@ -72,10 +74,7 @@ void widget_keypad_update(void *Self) } keypad->val = val; - /* finally, draw it! */ - if (W->class->draw) - W->class->draw(W); - + return val; } @@ -169,8 +168,7 @@ WIDGET_CLASS Widget_Keypad = { name:"keypad", type:WIDGET_TYPE_KEYPAD, init:widget_keypad_init, - draw:NULL, + draw:widget_keypad_draw, find:widget_keypad_find, - update:widget_keypad_update, quit:widget_keypad_quit, }; |