diff options
| author | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-20 01:19:26 +0100 |
|---|---|---|
| committer | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-20 01:19:26 +0100 |
| commit | 6c0c2f6f10e86986087c71a2964974ebcd939a3f (patch) | |
| tree | 0a16aff4380188c6ee222579dbb55392a230dbc0 /engine/include/serial | |
| parent | Ignore swap files (diff) | |
| download | flatland-6c0c2f6f10e86986087c71a2964974ebcd939a3f.tar.gz flatland-6c0c2f6f10e86986087c71a2964974ebcd939a3f.zip | |
Test 3 partially executed
Diffstat (limited to 'engine/include/serial')
| -rw-r--r-- | engine/include/serial/focusable.h | 3 | ||||
| -rw-r--r-- | engine/include/serial/keyfocusable.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/engine/include/serial/focusable.h b/engine/include/serial/focusable.h index 325f84b..6478ed4 100644 --- a/engine/include/serial/focusable.h +++ b/engine/include/serial/focusable.h @@ -1,12 +1,13 @@ #ifndef __FOCUSABLE_H__ #define __FOCUSABLE_H__ +#include "flatobject.h" #include "types.h" class task_s; union SDL_Event; -class Focusable +class Focusable : virtual public FlatObject { bool focused; diff --git a/engine/include/serial/keyfocusable.h b/engine/include/serial/keyfocusable.h index 02b3361..c97c791 100644 --- a/engine/include/serial/keyfocusable.h +++ b/engine/include/serial/keyfocusable.h @@ -5,7 +5,7 @@ struct SDL_KeyboardEvent; -class KeyFocusable : public Focusable +class KeyFocusable : virtual public Focusable { virtual void serial_cb(const SDL_Event*) override; |