Merge branch 'master' into nazara-next

2020-08-27 20:12:36 +02:00
parent 056b78c2f7 ee3b5347b8
commit b2a7e620e0
21 changed files with 617 additions and 27 deletions
--- a/include/Nazara/Platform/WindowHandle.hpp
+++ b/include/Nazara/Platform/WindowHandle.hpp
@@ -14,7 +14,7 @@ namespace Nz
 {
 	enum class WindowManager
 	{
-		None,
+		Invalid,

 		X11,
 		Wayland,
@@ -23,14 +23,14 @@ namespace Nz

 	struct WindowHandle
 	{
-		WindowManager type = WindowManager::None;
+		WindowManager type = WindowManager::Invalid;

 		union
 		{
 			struct
 			{
 				void* display; //< Display*
-				void* window;  //< Window
+				unsigned long window;  //< Window
 			} x11;

 			struct