diff options
| author | Nao Pross <naopross@thearcway.org> | 2019-01-25 02:54:54 +0100 |
|---|---|---|
| committer | Nao Pross <naopross@thearcway.org> | 2019-01-25 02:54:54 +0100 |
| commit | f58dea71037dca847e373f6efbf75b6056f212ac (patch) | |
| tree | 3b9b66379a583eb0b162418d037ec00b66e6bebc /engine/include/serial | |
| parent | Update configure.py to default build libflatland.{so, a} (diff) | |
| download | flatland-f58dea71037dca847e373f6efbf75b6056f212ac.tar.gz flatland-f58dea71037dca847e373f6efbf75b6056f212ac.zip | |
It compiles! Probably super broken, but compiles!
Diffstat (limited to 'engine/include/serial')
| -rw-r--r-- | engine/include/serial/focusable.hpp | 7 | ||||
| -rw-r--r-- | engine/include/serial/keyfocusable.hpp | 8 | ||||
| -rw-r--r-- | engine/include/serial/mousefocusable.hpp | 0 |
3 files changed, 8 insertions, 7 deletions
diff --git a/engine/include/serial/focusable.hpp b/engine/include/serial/focusable.hpp index 008f7a3..f139577 100644 --- a/engine/include/serial/focusable.hpp +++ b/engine/include/serial/focusable.hpp @@ -4,15 +4,14 @@ #include "core/object.hpp" #include "types.hpp" -class task_s; union SDL_Event; +namespace flat { + class Focusable : virtual public flat::core::object { bool focused; - task_s * event_trigger; - protected: /* Callback to event */ @@ -34,4 +33,6 @@ public: void serial_precall(void*); }; +} + #endif diff --git a/engine/include/serial/keyfocusable.hpp b/engine/include/serial/keyfocusable.hpp index e28e333..26f3ce2 100644 --- a/engine/include/serial/keyfocusable.hpp +++ b/engine/include/serial/keyfocusable.hpp @@ -5,6 +5,8 @@ struct SDL_KeyboardEvent; +namespace flat { + class KeyFocusable : virtual public Focusable { @@ -15,10 +17,8 @@ class KeyFocusable : virtual public Focusable protected: virtual void key_cb(const SDL_KeyboardEvent*) = 0; - -public: - - using Focusable::Focusable; }; +} + #endif diff --git a/engine/include/serial/mousefocusable.hpp b/engine/include/serial/mousefocusable.hpp deleted file mode 100644 index e69de29..0000000 --- a/engine/include/serial/mousefocusable.hpp +++ /dev/null |