From 77d13918dd55a7cc0386ad48a03ba5349be954d6 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Fri, 5 Nov 2004 16:03:11 +0000
Subject: [PATCH] Merged 2417

---
 src/mmg/jobs.cpp       | 4 ++++
 src/mmg/mux_dialog.cpp | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/mmg/jobs.cpp b/src/mmg/jobs.cpp
index bd3eb1905..1459ff071 100644
--- a/src/mmg/jobs.cpp
+++ b/src/mmg/jobs.cpp
@@ -226,7 +226,11 @@ job_run_dialog::process_input() {
       got_char = false;
 
     if (got_char && ((c == '\n') || (c == '\r') || out->Eof())) {
+#if WXUNICODE
       wx_line = wxU(to_utf8(cc_local_utf8, line).c_str());
+#else
+      wx_line = line.c_str();
+#endif
       if (wx_line.Find(wxT("progress")) == 0) {
         if (wx_line.Find(wxT("%)")) != 0) {
           wx_line.Remove(wx_line.Find(wxT("%)")));
diff --git a/src/mmg/mux_dialog.cpp b/src/mmg/mux_dialog.cpp
index 59bde3b17..45ee17c7e 100644
--- a/src/mmg/mux_dialog.cpp
+++ b/src/mmg/mux_dialog.cpp
@@ -160,7 +160,11 @@ mux_dialog::mux_dialog(wxWindow *parent):
       app->Dispatch();
 
     if ((c == '\n') || (c == '\r') || out->Eof()) {
+#if WXUNICODE
       wx_line = wxU(to_utf8(cc_local_utf8, line).c_str());
+#else
+      wx_line = line.c_str();
+#endif
       log += wx_line + wxT("\n");
       if (wx_line.Find(wxT("Warning:")) == 0)
         tc_warnings->AppendText(wx_line + wxT("\n"));