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

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/button.h (modified) (1 diff)

uspace/lib/gui/button.h

@@ -56 +56 @@
 } button_t;
 
-extern bool init_button(button_t *, widget_t *, const char *, uint16_t, pixel_t,
-    pixel_t, pixel_t);
-extern button_t *create_button(widget_t *, const char *, uint16_t, pixel_t,
-    pixel_t, pixel_t);
+extern bool init_button(button_t *, widget_t *, const void *, const char *,
+    uint16_t, pixel_t, pixel_t, pixel_t);
+extern button_t *create_button(widget_t *, const void *, const char *, uint16_t,
+    pixel_t, pixel_t, pixel_t);
 extern void deinit_button(button_t *);