From 70427e6d7e0e06e0559aed167e86784a9c176f34 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Sun, 3 Jun 2012 23:57:31 +0200
Subject: WINTERMUTE: Make text-measuring work without FreeType2.

---
 engines/wintermute/utils/StringUtil.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/wintermute/utils')

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);
 }
 
 //////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3