From 876fc624df9728ee0feee26e1b31b53ed9ef3326 Mon Sep 17 00:00:00 2001 From: Dusan Durech Date: Sun, 12 Apr 2009 14:29:51 +0200 Subject: convert all name function from oldName to new_name --- src/widget/widget_buttonimage.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/widget/widget_buttonimage.c') diff --git a/src/widget/widget_buttonimage.c b/src/widget/widget_buttonimage.c index a896142..a924c5d 100644 --- a/src/widget/widget_buttonimage.c +++ b/src/widget/widget_buttonimage.c @@ -10,7 +10,7 @@ #include "widget.h" #include "widget_buttonimage.h" -widget_t *newWidgetButtonimage(image_t * image, int x, int y, void (*fce_event) (void *)) +widget_t *buttonImage_new(image_t * image, int x, int y, void (*fce_event) (void *)) { widget_buttonimage_t *new; @@ -21,10 +21,10 @@ widget_t *newWidgetButtonimage(image_t * image, int x, int y, void (*fce_event) new->active = 0; new->fce_event = fce_event; - return newWidget(WIDGET_TYPE_BUTTONIMAGE, x, y, new->w, new->h, new); + return widget_new(WIDGET_TYPE_BUTTONIMAGE, x, y, new->w, new->h, new); } -void setWidgetButtonimageActive(widget_t * widget, bool_t active) +void buttonImage_set_active(widget_t * widget, bool_t active) { widget_buttonimage_t *p; @@ -35,7 +35,7 @@ void setWidgetButtonimageActive(widget_t * widget, bool_t active) p->active = active; } -void drawWidgetButtonimage(widget_t * widget) +void buttonImage_draw(widget_t * widget) { widget_buttonimage_t *p; @@ -43,10 +43,10 @@ void drawWidgetButtonimage(widget_t * widget) assert(widget->type == WIDGET_TYPE_BUTTONIMAGE); p = (widget_buttonimage_t *) widget->private_data; - drawImage(p->image, widget->x, widget->y, p->active * p->w, 0, p->w, p->h); + image_draw(p->image, widget->x, widget->y, p->active * p->w, 0, p->w, p->h); } -void eventWidgetButtonimage(widget_t * widget) +void buttonImage_event(widget_t * widget) { widget_buttonimage_t *p; static int my_time = 0; @@ -62,17 +62,17 @@ void eventWidgetButtonimage(widget_t * widget) return; } - getMousePosition(&x, &y); + interface_get_mouse_position(&x, &y); if (x >= widget->x && x <= widget->x + p->w && - y >= widget->y && y <= widget->y + p->h && isMouseClicked()) { + y >= widget->y && y <= widget->y + p->h && interface_is_mouse_clicket()) { my_time = WIDGET_BUTTONIMAGE_TIME; p->active = 1; p->fce_event(widget); } } -void destroyWidgetButtonimage(widget_t * widget) +void buttonImage_destroy(widget_t * widget) { widget_buttonimage_t *p; @@ -82,5 +82,5 @@ void destroyWidgetButtonimage(widget_t * widget) p = (widget_buttonimage_t *) widget->private_data; free(p); - destroyWidget(widget); + widget_destroy(widget); } -- cgit v1.2.3