summaryrefslogtreecommitdiffstats
path: root/engine/include/window.hpp
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2019-01-25 02:54:54 +0100
committerNao Pross <naopross@thearcway.org>2019-01-25 02:54:54 +0100
commitf58dea71037dca847e373f6efbf75b6056f212ac (patch)
tree3b9b66379a583eb0b162418d037ec00b66e6bebc /engine/include/window.hpp
parentUpdate configure.py to default build libflatland.{so, a} (diff)
downloadflatland-f58dea71037dca847e373f6efbf75b6056f212ac.tar.gz
flatland-f58dea71037dca847e373f6efbf75b6056f212ac.zip
It compiles! Probably super broken, but compiles!
Diffstat (limited to 'engine/include/window.hpp')
-rw-r--r--engine/include/window.hpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/engine/include/window.hpp b/engine/include/window.hpp
index 7b3fa9a..98e8e04 100644
--- a/engine/include/window.hpp
+++ b/engine/include/window.hpp
@@ -1,8 +1,16 @@
#ifndef __FLATWINDOW_H__
#define __FLATWINDOW_H__
+#include "core/object.hpp"
+#include "serial/keyfocusable.hpp"
+
#include <string>
+class SDL_Window;
+class SDL_KeyEvent;
+
+namespace flat {
+
struct window_status
{
window_status( unsigned char fullscreen = 0,
@@ -26,15 +34,10 @@ struct window_status
unsigned char focus:1;
};
-#include "core/object.hpp"
-#include "serial/keyfocusable.hpp"
-class SDL_Window;
class FlatLayer;
-class SDL_KeyEvent;
-
-class FlatWindow : virtual public flat::core::object, public KeyFocusable
+class FlatWindow : virtual public core::object, public KeyFocusable
{
std::string title;
window_status status;
@@ -94,4 +97,5 @@ public:
static uint32_t winstatus_to_flags(window_status);
};
+}
#endif