Merge branch 'master' into VC/TextFinish

# Conflicts: # src/text/Text.cpp
2020-10-11 10:34:47 +03:00
parent 43af5d9c1f e26e85deb8
commit 9dba2386bb
7 changed files with 35 additions and 31 deletions
--- a/src/render/Font.h
+++ b/src/render/Font.h
@@ -1,5 +1,10 @@
 #pragma once

+void AsciiToUnicode(const char *src, wchar *dst);
+void UnicodeStrcpy(wchar *dst, const wchar *src);
+void UnicodeStrcat(wchar *dst, wchar *append);
+int UnicodeStrlen(const wchar *str);
+
 struct CFontDetails
 {
 	CRGBA color;