Changeset 25eec4e in mainline for uspace/lib/gui/grid.h

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 mainline chages.

File:

• uspace/lib/gui/grid.h (modified) (1 diff)

uspace/lib/gui/grid.h

@@ -39 +39 @@
 #include <sys/types.h>
 #include <io/pixel.h>
-
 #include "widget.h"
 
-struct grid;
-typedef struct grid grid_t;
+typedef struct {
+        widget_t *widget;
+        size_t cols;
+        size_t rows;
+} grid_cell_t;
 
 typedef struct grid {
         widget_t widget;
         pixel_t background;
+        size_t cols;
         size_t rows;
-        size_t cols;
-        widget_t **layout;
-        void (*add)(grid_t *, widget_t *, size_t, size_t, size_t, size_t);
+        grid_cell_t *layout;
+        bool (*add)(struct grid *, widget_t *, size_t, size_t, size_t, size_t);
 } grid_t;