diff options
| author | Nao Pross <naopross@thearcway.org> | 2019-01-22 14:01:30 +0100 |
|---|---|---|
| committer | Nao Pross <naopross@thearcway.org> | 2019-01-22 14:01:30 +0100 |
| commit | 59e71b7dbd321eb3dc2ed7afecb66840115c3c15 (patch) | |
| tree | cc8dce2f732b90b12bbc5b46c50fd434df4aba14 /engine/include/flatwindow.h | |
| parent | Add test for task and job, fix bug in job (diff) | |
| parent | Duplicate (diff) | |
| download | flatland-59e71b7dbd321eb3dc2ed7afecb66840115c3c15.tar.gz flatland-59e71b7dbd321eb3dc2ed7afecb66840115c3c15.zip | |
Merge remote-tracking branch 'raffa/master'
Diffstat (limited to 'engine/include/flatwindow.h')
| -rw-r--r-- | engine/include/flatwindow.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/include/flatwindow.h b/engine/include/flatwindow.h index 11d7134..c03a3a9 100644 --- a/engine/include/flatwindow.h +++ b/engine/include/flatwindow.h @@ -26,7 +26,7 @@ struct window_status unsigned char focus:1; }; -#include "flatobject.h" +#include "object.hpp" #include "serial/keyfocusable.h" class SDL_Window; @@ -34,7 +34,7 @@ class FlatLayer; class SDL_KeyEvent; -class FlatWindow : virtual public FlatObject, public KeyFocusable +class FlatWindow : virtual public flat::core::object, public KeyFocusable { std::string title; window_status status; @@ -91,7 +91,7 @@ public: void setWindowStatus(window_status); - static Uint32 winstatus_to_flags(window_status); + static uint32_t winstatus_to_flags(window_status); }; #endif |