Changeset c2a6983 in mainline for uspace/lib/gui/canvas.h

Timestamp:

2013-10-13T20:59:33Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

12d6c98

Parents:

820104d (diff), 39bcc99 (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 changes

File:

• uspace/lib/gui/canvas.h (modified) (3 diffs)

uspace/lib/gui/canvas.h

@@ -42 +42 @@
 #include <surface.h>
 #include "widget.h"
+#include "connection.h"
 
 typedef struct {
@@ -48 +49 @@
         sysarg_t height;
         surface_t *surface;
+        signal_t keyboard_event;
 } canvas_t;
 
@@ -53 +55 @@
     surface_t *);
 extern canvas_t *create_canvas(widget_t *, sysarg_t, sysarg_t, surface_t *);
+extern bool update_canvas(canvas_t *, surface_t *);
 extern void deinit_canvas(canvas_t *);