From 64ad82bdd8329c0adffc2c0b9285fb8b86d735ba Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Fri, 6 Jul 2007 13:30:52 +0000
Subject: [PATCH] Fixed 'todo' in reader in ASCII build

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@503 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 src/mse.vcproj         | 2 +-
 src/util/io/reader.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mse.vcproj b/src/mse.vcproj
index f43e5df5..f61c932c 100644
--- a/src/mse.vcproj
+++ b/src/mse.vcproj
@@ -40,7 +40,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="rpcrt4.lib wsock32.lib comctl32.lib odbc32.lib odbccp32.lib wxbase26d.lib wxmsw26d_core.lib"
+				AdditionalDependencies="rpcrt4.lib wsock32.lib comctl32.lib wxbase26d.lib wxmsw26d_core.lib wxjpegd.lib wxpngd.lib wxtiffd.lib wxzlibd.lib wxregexd.lib wxbase26d_net.lib wxmsw26d_html.lib"
 				OutputFile="$(OutDir)/mse.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="libcd.lib,libcid.lib"
diff --git a/src/util/io/reader.cpp b/src/util/io/reader.cpp
index d4954a59..d53866ae 100644
--- a/src/util/io/reader.cpp
+++ b/src/util/io/reader.cpp
@@ -147,7 +147,7 @@ String read_utf8_line(wxInputStream& input, bool eat_bom, bool until_eof) {
 		wxConvUTF8.MB2WC(result_buf, &buffer[0], size + 1);
 		result.UngetWriteBuf(size);
 	#else
-		// TODO!
+		result = String(&buffer[0], *wxConvCurrent);
 	#endif
 	return eat_bom ? decodeUTF8BOM(result) : result;
 }