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/text/Text.h
+++ b/src/text/Text.h
@@ -1,12 +1,8 @@
 #pragma once

-void AsciiToUnicode(const char *src, wchar *dst);
 char *UnicodeToAscii(wchar *src);
 char *UnicodeToAsciiForSaveLoad(wchar *src);
 char *UnicodeToAsciiForMemoryCard(wchar *src);
-void UnicodeStrcpy(wchar *dst, const wchar *src);
-void UnicodeStrcat(wchar *dst, wchar *append);
-int UnicodeStrlen(const wchar *str);
 void TextCopy(wchar *dst, const wchar *src);
 void UnicodeMakeUpperCase(wchar *dst, wchar *src);