From 68b4e0616ab80a32903d0c6ede232e47d4d88382 Mon Sep 17 00:00:00 2001 From: reinelt Date: Wed, 8 Feb 2006 04:55:05 +0000 Subject: [lcd4linux @ 2006-02-08 04:55:03 by reinelt] moved widget registration to drv_generic_graphic git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@635 3ae390bd-cb1e-0410-b409-cd5a39f66f1f --- drv_Image.c | 37 +++++-------------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) (limited to 'drv_Image.c') diff --git a/drv_Image.c b/drv_Image.c index 8d68e18..0ee912b 100644 --- a/drv_Image.c +++ b/drv_Image.c @@ -1,4 +1,4 @@ -/* $Id: drv_Image.c,v 1.16 2006/02/06 06:29:30 reinelt Exp $ +/* $Id: drv_Image.c,v 1.17 2006/02/08 04:55:04 reinelt Exp $ * * new style Image (PPM/PNG) Driver for LCD4Linux * @@ -23,6 +23,9 @@ * * * $Log: drv_Image.c,v $ + * Revision 1.17 2006/02/08 04:55:04 reinelt + * moved widget registration to drv_generic_graphic + * * Revision 1.16 2006/02/06 06:29:30 reinelt * Image driver uses RGBA * @@ -124,10 +127,6 @@ #include "timer.h" #include "qprintf.h" #include "plugin.h" -#include "widget.h" -#include "widget_text.h" -#include "widget_icon.h" -#include "widget_bar.h" #include "drv.h" #include "drv_generic_graphic.h" @@ -460,16 +459,6 @@ static int drv_IMG_start(const char *section) /* none at the moment... */ -/****************************************/ -/*** widget callbacks ***/ -/****************************************/ - - -/* using drv_generic_graphic_draw(W) */ -/* using drv_generic_graphic_icon_draw(W) */ -/* using drv_generic_graphic_bar_draw(W) */ - - /****************************************/ /*** exported functions ***/ /****************************************/ @@ -487,10 +476,9 @@ int drv_IMG_list(void) int drv_IMG_init(const char *section, const __attribute__ ((unused)) int quiet) { - WIDGET_CLASS wc; int ret; - info("%s: %s", Name, "$Revision: 1.16 $"); + info("%s: %s", Name, "$Revision: 1.17 $"); /* real worker functions */ drv_generic_graphic_real_blit = drv_IMG_blit; @@ -503,21 +491,6 @@ int drv_IMG_init(const char *section, const __attribute__ ((unused)) if ((ret = drv_generic_graphic_init(section, Name)) != 0) return ret; - /* register text widget */ - wc = Widget_Text; - wc.draw = drv_generic_graphic_draw; - widget_register(&wc); - - /* register icon widget */ - wc = Widget_Icon; - wc.draw = drv_generic_graphic_icon_draw; - widget_register(&wc); - - /* register bar widget */ - wc = Widget_Bar; - wc.draw = drv_generic_graphic_bar_draw; - widget_register(&wc); - /* register plugins */ /* none at the moment... */ -- cgit v1.2.3