From d582ecc89ee766912c7220adcd5b3754fe6afb0c Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sat, 26 Feb 2005 22:59:18 +0000 Subject: [PATCH] Strings must be wide in Unicode mode. --- ChangeLog | 3 +++ src/mmg/jobs.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff0e4e15f..07c59bd26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-02-26 Moritz Bunkus + * mmg: bug fix: The job status in the job runner dialog was broken + on Unicode builds on all systems. + * mmg: bug fix: "Splitting by time" was not selectable on Windows Unicode builds (problem with wxWidgets 2.5.3). diff --git a/src/mmg/jobs.cpp b/src/mmg/jobs.cpp index 5bae068d9..b7b98662c 100644 --- a/src/mmg/jobs.cpp +++ b/src/mmg/jobs.cpp @@ -274,7 +274,7 @@ void job_run_dialog::on_end_process(wxProcessEvent &evt) { int exit_code, ndx; wxString s; - const char *status; + const wxChar *status; process_input(); @@ -282,16 +282,16 @@ job_run_dialog::on_end_process(wxProcessEvent &evt) { exit_code = evt.GetExitCode(); if (abort) { jobs[ndx].status = JOBS_ABORTED; - status = "aborted"; + status = wxT("aborted"); } else if (exit_code == 0) { jobs[ndx].status = JOBS_DONE; - status = "completed OK"; + status = wxT("completed OK"); } else if (exit_code == 1) { jobs[ndx].status = JOBS_DONE_WARNINGS; - status = "completed with warnings"; + status = wxT("completed with warnings"); } else { jobs[ndx].status = JOBS_FAILED; - status = "failed"; + status = wxT("failed"); } jobs[ndx].finished_on = time(NULL);