Changeset f126c87 in mainline for uspace/lib/gui/widget.h

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/widget.h (modified) (2 diffs)

uspace/lib/gui/widget.h

@@ -53 +53 @@
 struct widget {
         link_t link;
-        widget_t *parent; /**< Parent widget of this widget. NULL for root widget. */
-        list_t children; /**< Children widgets of this widget. */
-        window_t *window; /**< Window into which this widget belongs. */
-
+        widget_t *parent;  /**< Parent widget of this widget. NULL for root widget. */
+        list_t children;   /**< Children widgets of this widget. */
+        window_t *window;  /**< Window into which this widget belongs. */
+        const void *data;  /**< Custom client data. */
+        
         sysarg_t hpos; /**< Horizontal position in window coordinates. */
         sysarg_t vpos; /**< Vertical position in window coordinates. */
@@ -128 +129 @@
  */
 
-/** Link widget with parent and initialize default position and size. */
-extern void widget_init(widget_t *, widget_t *);
-/** Just convenience function to change position and size of the widget. */
+extern void widget_init(widget_t *, widget_t *, const void *);
 extern void widget_modify(widget_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t);
-/** Unlink widget from its parent. */
+extern const void *widget_get_data(widget_t *);
 extern void widget_deinit(widget_t *);