Added UTF8 Support for window title (EncoDesktop, EncoShared)

Naronco · Nov 23, 2014 · b379816 · b379816
1 parent 65a8abb
commit b379816
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/EncoDesktop/DesktopView.h b/EncoDesktop/DesktopView.h
@@ -6,12 +6,15 @@
 #include "stdafx.h"
 
 #include <EncoShared\EncoShared.h>
+#include <codecvt>
 
 namespace enco {
 	class DesktopView : public IView {
 	public:
 		inline DesktopView(const std::string &title, const glm::u32vec2 &size = glm::u32vec2(320, 240)) : m_window(nullptr) { m_name = title; m_size = size; }
 		inline DesktopView(const std::string &title, u32 width, u32 height) : DesktopView(title, glm::u32vec2(width, height)) {  }
+		inline DesktopView(const std::wstring &title, const glm::u32vec2 &size = glm::u32vec2(320, 240)) : DesktopView(g_utf8conv.to_bytes(title), size) {  }
+		inline DesktopView(const std::wstring &title, u32 width, u32 height) : DesktopView(g_utf8conv.to_bytes(title), glm::u32vec2(width, height)) {  }
 
 		ENCODESKTOPAPI virtual void create(IRenderer *renderer);
 		ENCODESKTOPAPI virtual void destroy();

diff --git a/EncoShared/stdafx.cpp b/EncoShared/stdafx.cpp
@@ -1,8 +1,3 @@
-// stdafx.cpp : Quelldatei, die nur die Standard-Includes einbindet.
-// EncoShared.pch ist der vorkompilierte Header.
-// stdafx.obj enthält die vorkompilierten Typinformationen.
-
 #include "stdafx.h"
 
-// TODO: Auf zusätzliche Header verweisen, die in STDAFX.H
-// und nicht in dieser Datei erforderlich sind.
+ENCOSHAREDAPI std::wstring_convert<std::codecvt_utf8<wchar_t>> enco::g_utf8conv;
diff --git a/EncoShared/stdafx.h b/EncoShared/stdafx.h
@@ -17,6 +17,8 @@
 #	define ENCOSHAREDAPI
 #endif
 
+#include <codecvt>
+
 namespace enco {
 	typedef char int8, i8;
 	typedef short int16, i16;
@@ -30,4 +32,6 @@ namespace enco {
 
 	typedef float f32, float32;
 	typedef double f64, float64;
+
+	ENCOSHAREDAPI extern std::wstring_convert<std::codecvt_utf8<wchar_t>> g_utf8conv;
 }