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

Timestamp:

2016-09-01T16:46:27Z (9 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/minimal.c (modified) (3 diffs)

uspace/lib/gui/minimal.c

@@ -112 +112 @@
 }
 
-bool init_minimal(minimal_t *min, widget_t *parent, pixel_t a, pixel_t b)
+bool init_minimal(minimal_t *min, widget_t *parent, const void *data, pixel_t a,
+    pixel_t b)
 {
-        widget_init(&min->widget, parent);
+        widget_init(&min->widget, parent, data);
 
         min->widget.destroy = minimal_destroy;
@@ -129 +130 @@
 }
 
-minimal_t *create_minimal(widget_t *parent, pixel_t a, pixel_t b)
+minimal_t *create_minimal(widget_t *parent, const void *data, pixel_t a,
+    pixel_t b)
 {
         minimal_t *min = (minimal_t *) malloc(sizeof(minimal_t));
@@ -136 +138 @@
         }
 
-        if (init_minimal(min, parent, a, b)) {
+        if (init_minimal(min, parent, data, a, b)) {
                 return min;
         } else {