Merge branch 'master' into vulkan

src/Nazara/Platform/Keyboard.cpp

@@ -3,26 +3,48 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Platform/Keyboard.hpp>
-
-#if defined(NAZARA_PLATFORM_WINDOWS)
-	#include <Nazara/Platform/Win32/InputImpl.hpp>
-#elif defined(NAZARA_PLATFORM_X11)
-	#include <Nazara/Platform/X11/InputImpl.hpp>
-#else
-	#error Lack of implementation: Keyboard
-#endif
-
+#include <Nazara/Platform/SDL2/InputImpl.hpp>
 #include <Nazara/Platform/Debug.hpp>
 
 namespace Nz
 {
-	String Keyboard::GetKeyName(Key key)
+	String Keyboard::GetKeyName(Scancode scancode)
+	{
+		return EventImpl::GetKeyName(scancode);
+	}
+
+	String Keyboard::GetKeyName(VKey key)
 	{
 		return EventImpl::GetKeyName(key);
 	}
 
-	bool Keyboard::IsKeyPressed(Key key)
+	bool Keyboard::IsKeyPressed(Scancode scancode)
+	{
+		return EventImpl::IsKeyPressed(scancode);
+	}
+
+	bool Keyboard::IsKeyPressed(VKey key)
 	{
 		return EventImpl::IsKeyPressed(key);
 	}
+
+	void Keyboard::StartTextInput()
+	{
+		EventImpl::StartTextInput();
+	}
+
+	void Keyboard::StopTextInput()
+	{
+		EventImpl::StopTextInput();
+	}
+
+	Keyboard::Scancode Keyboard::ToScanCode(VKey key)
+	{
+		return EventImpl::ToScanCode(key);
+	}
+
+	Keyboard::VKey Keyboard::ToVirtualKey(Scancode scancode)
+	{
+		return EventImpl::ToVirtualKey(scancode);
+	}
 }