Changeset f126c87 in mainline for uspace/lib/gui/label.c

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from mainline.

File:

• uspace/lib/gui/label.c (modified) (3 diffs)

uspace/lib/gui/label.c

@@ -140 +140 @@
 }
 
-bool init_label(label_t *lbl, widget_t *parent, const char *caption,
-    uint16_t points, pixel_t background, pixel_t text)
-{
-        widget_init(&lbl->widget, parent);
+bool init_label(label_t *lbl, widget_t *parent, const void *data,
+    const char *caption, uint16_t points, pixel_t background, pixel_t text)
+{
+        widget_init(&lbl->widget, parent, data);
         
         lbl->widget.destroy = label_destroy;
@@ -184 +184 @@
 }
 
-label_t *create_label(widget_t *parent, const char *caption, uint16_t points,
-    pixel_t background, pixel_t text)
+label_t *create_label(widget_t *parent, const void *data, const char *caption,
+    uint16_t points, pixel_t background, pixel_t text)
 {
         label_t *lbl = (label_t *) malloc(sizeof(label_t));
@@ -191 +191 @@
                 return NULL;
         
-        if (init_label(lbl, parent, caption, points, background, text))
+        if (init_label(lbl, parent, data, caption, points, background, text))
                 return lbl;