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

uspace/lib/gui/grid.c

@@ -363 +363 @@
 }
 
-bool init_grid(grid_t *grid, widget_t *parent, size_t cols, size_t rows,
-    pixel_t background)
+bool init_grid(grid_t *grid, widget_t *parent, const void *data, size_t cols,
+    size_t rows, pixel_t background)
 {
         if ((cols == 0) || (rows == 0))
@@ -376 +376 @@
         memset(grid->layout, 0, cols * rows * sizeof(grid_cell_t));
         
-        widget_init(&grid->widget, parent);
+        widget_init(&grid->widget, parent, data);
         
         grid->widget.destroy = grid_destroy;
@@ -393 +393 @@
 }
 
-grid_t *create_grid(widget_t *parent, size_t cols, size_t rows, pixel_t background)
+grid_t *create_grid(widget_t *parent, const void *data, size_t cols,
+    size_t rows, pixel_t background)
 {
         grid_t *grid = (grid_t *) malloc(sizeof(grid_t));
@@ -399 +400 @@
                 return NULL;
         
-        if (init_grid(grid, parent, cols, rows, background))
+        if (init_grid(grid, parent, data, cols, rows, background))
                 return grid;