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

uspace/lib/gui/window.c

@@ -591 +591 @@
 }
 
-window_t *window_open(const char *winreg, window_flags_t flags,
-    const char *caption)
+window_t *window_open(const char *winreg, const void *data,
+    window_flags_t flags, const char *caption)
 {
         window_t *win = (window_t *) malloc(sizeof(window_t));
@@ -604 +604 @@
         fibril_mutex_initialize(&win->guard);
         
-        widget_init(&win->root, NULL);
+        widget_init(&win->root, NULL, data);
         win->root.window = win;
         win->root.destroy = root_destroy;