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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/gui/label.h

    r9befb0d rf126c87  
    5555} label_t;
    5656
    57 extern bool init_label(label_t *, widget_t *, const char *, uint16_t, pixel_t,
    58     pixel_t);
    59 extern label_t *create_label(widget_t *, const char *, uint16_t, pixel_t,
    60     pixel_t);
     57extern bool init_label(label_t *, widget_t *, const void *, const char *,
     58    uint16_t, pixel_t, pixel_t);
     59extern label_t *create_label(widget_t *, const void *, const char *, uint16_t,
     60    pixel_t, pixel_t);
    6161extern void deinit_label(label_t *);
    6262
Note: See TracChangeset for help on using the changeset viewer.