diff options
author | Einar Johan Trøan Sømåen | 2012-06-03 23:57:31 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-06-03 23:57:31 +0200 |
commit | 70427e6d7e0e06e0559aed167e86784a9c176f34 (patch) | |
tree | 67ce0152c20a788752d2bb737070a82201dede0a /engines/wintermute/utils | |
parent | a3901c76fdea01f40b0941d46bd2eb538d89341d (diff) | |
download | scummvm-rg350-70427e6d7e0e06e0559aed167e86784a9c176f34.tar.gz scummvm-rg350-70427e6d7e0e06e0559aed167e86784a9c176f34.tar.bz2 scummvm-rg350-70427e6d7e0e06e0559aed167e86784a9c176f34.zip |
WINTERMUTE: Make text-measuring work without FreeType2.
Diffstat (limited to 'engines/wintermute/utils')
-rw-r--r-- | engines/wintermute/utils/StringUtil.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/wintermute/utils/StringUtil.cpp b/engines/wintermute/utils/StringUtil.cpp index cd4f99e034..8ca2ed8c07 100644 --- a/engines/wintermute/utils/StringUtil.cpp +++ b/engines/wintermute/utils/StringUtil.cpp @@ -179,7 +179,7 @@ Utf8String StringUtil::WideToUtf8(const WideString &WideStr) { //////////////////////////////////////////////////////////////////////////
WideString StringUtil::AnsiToWide(const AnsiString &str) {
// using default os locale!
- error("StringUtil::AnsiToWide - WideString not supported yet");
+ warning("StringUtil::AnsiToWide - WideString not supported yet");
/* setlocale(LC_CTYPE, "");
size_t WideSize = mbstowcs(NULL, str.c_str(), 0) + 1;
wchar_t *wstr = new wchar_t[WideSize];
@@ -187,13 +187,13 @@ WideString StringUtil::AnsiToWide(const AnsiString &str) { WideString ResultString(wstr);
delete [] wstr;
return ResultString;*/
- return "";
+ return WideString(str);
}
//////////////////////////////////////////////////////////////////////////
AnsiString StringUtil::WideToAnsi(const WideString &wstr) {
// using default os locale!
- error("StringUtil::WideToAnsi - WideString not supported yet");
+ warning("StringUtil::WideToAnsi - WideString not supported yet");
/* setlocale(LC_CTYPE, "");
size_t WideSize = wcstombs(NULL, wstr.c_str(), 0) + 1;
char *str = new char[WideSize];
@@ -201,7 +201,7 @@ AnsiString StringUtil::WideToAnsi(const WideString &wstr) { AnsiString ResultString(str);
delete [] str;
return ResultString;*/
- return "";
+ return AnsiString(wstr);
}
//////////////////////////////////////////////////////////////////////////
|