pim/mongoose-touch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove 'user_data' arg from widget_set_handler

Browse Source
This commit is contained in:
Pim van Pelt
2017-12-02 13:42:32 +01:00
parent 5a283bd87f
commit 980ac4c7cf
6 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/screen.h
View File

@ -12,7 +12,6 @@ struct screen_t {
// Private
SLIST_HEAD(widget_entries, widget_list_t) widget_entries;
widget_event_fn default_widget_handler;
void *default_user_data;
};
struct screen_t *screen_create(char *name);
@ -20,7 +19,7 @@ struct screen_t *screen_create_from_file(char *fn, widget_event_fn handler, void
struct screen_t *screen_create_from_json(char *json, widget_event_fn handler, void *user_data);
void screen_destroy(struct screen_t **s);
void screen_widget_set_handler(struct screen_t *s, widget_event_fn handler, void *user_data);
void screen_widget_set_handler(struct screen_t *s, widget_event_fn handler);
bool screen_widget_add(struct screen_t *s, struct widget_t *w);
struct widget_t *screen_widget_add_from_file(struct screen_t *s, char *fn);

2
include/widget.h
View File

@ -45,7 +45,7 @@ struct widget_list_t {
};
struct widget_t *widget_create(char *name, uint16_t x, uint16_t y, uint16_t w, uint16_t h);
void widget_set_handler(struct widget_t *w, widget_event_fn handler, void *user_data);
void widget_set_handler(struct widget_t *w, widget_event_fn handler);
void widget_delete_handler(struct widget_t *w);
void widget_set_timer(struct widget_t *w, uint32_t timer_msec);
void widget_delete_timer(struct widget_t *w);