Changeset 10cb47e in mainline for uspace/lib/gui/button.c
- Timestamp:
- 2016-08-31T15:43:01Z (8 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- bdfdc51c
- Parents:
- 58563585
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/gui/button.c
r58563585 r10cb47e 147 147 } 148 148 149 bool init_button(button_t *btn, widget_t *parent, const char *caption, 150 uint16_t points, pixel_t background, pixel_t foreground, pixel_t text) 151 { 152 widget_init(&btn->widget, parent); 149 bool init_button(button_t *btn, widget_t *parent, const void *data, 150 const char *caption, uint16_t points, pixel_t background, 151 pixel_t foreground, pixel_t text) 152 { 153 widget_init(&btn->widget, parent, data); 153 154 154 155 btn->widget.destroy = button_destroy; … … 191 192 } 192 193 193 button_t *create_button(widget_t *parent, const char *caption, uint16_t points,194 pixel_t background, pixel_t foreground, pixel_t text)194 button_t *create_button(widget_t *parent, const void *data, const char *caption, 195 uint16_t points, pixel_t background, pixel_t foreground, pixel_t text) 195 196 { 196 197 button_t *btn = (button_t *) malloc(sizeof(button_t)); … … 198 199 return NULL; 199 200 200 if (init_button(btn, parent, caption, points, background, foreground,201 if (init_button(btn, parent, data, caption, points, background, foreground, 201 202 text)) 202 203 return btn;
Note:
See TracChangeset
for help on using the changeset viewer.