Changeset f126c87 in mainline for uspace/lib/gui/canvas.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/canvas.c (modified) (3 diffs)

uspace/lib/gui/canvas.c

@@ -123 +123 @@
 }
 
-bool init_canvas(canvas_t *canvas, widget_t *parent, sysarg_t width,
-    sysarg_t height, surface_t *surface)
+bool init_canvas(canvas_t *canvas, widget_t *parent, const void *data,
+    sysarg_t width, sysarg_t height, surface_t *surface)
 {
-        widget_init(&canvas->widget, parent);
+        widget_init(&canvas->widget, parent, data);
         
         canvas->widget.width = width;
@@ -161 +161 @@
 }
 
-canvas_t *create_canvas(widget_t *parent, sysarg_t width, sysarg_t height,
-    surface_t *surface)
+canvas_t *create_canvas(widget_t *parent, const void *data, sysarg_t width,
+    sysarg_t height, surface_t *surface)
 {
         canvas_t *canvas = (canvas_t *) malloc(sizeof(canvas_t));
@@ -168 +168 @@
                 return NULL;
         
-        if (init_canvas(canvas, parent, width, height, surface))
+        if (init_canvas(canvas, parent, data, width, height, surface))
                 return canvas;