Merged 2417

This commit is contained in:
Moritz Bunkus 2004-11-05 16:03:11 +00:00
parent f160ef592c
commit 77d13918dd
2 changed files with 8 additions and 0 deletions

View File

@ -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("%)")));

View File

@ -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"));