diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-02-16 01:58:52 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-02-16 01:58:52 +0000 |
| commit | f4b2eba2ae5bda79d14e6deb199b2865ba5542c3 (patch) | |
| tree | d505661e824344e1991082c973530e4e4ec8d33a /src | |
| parent | e256740c3e536bb5bd974b58e3c358ef2f555685 (diff) | |
Some portability fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dvdomatic.cc | 2 | ||||
| -rw-r--r-- | src/wx/job_manager_view.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index bab49c2dc..5d944a934 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -445,7 +445,7 @@ class App : public wxApp film.reset (new Film (film_to_load)); film->log()->set_level (log_level); } catch (exception& e) { - error_dialog (0, String::compose ("Could not load film %1 (%2)", film_to_load, e.what())); + error_dialog (0, std_to_wx (String::compose ("Could not load film %1 (%2)", film_to_load, e.what()))); } } diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index a521f5b80..8bede709f 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -131,7 +131,7 @@ JobManagerView::details_clicked (wxCommandEvent& ev) if (i->second.details == o) { string s = i->first->error_summary(); s[0] = toupper (s[0]); - error_dialog (this, String::compose ("%1.\n\n%2", s, i->first->error_details())); + error_dialog (this, std_to_wx (String::compose ("%1.\n\n%2", s, i->first->error_details()))); } } } |