diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-03-26 16:59:30 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-03-26 16:59:30 +0000 |
| commit | 09594dda3d006672309dbe2f886563f4ef5d2ab6 (patch) | |
| tree | b4effc0df6f91346db318f9fa615ab20d4b96101 /src | |
| parent | ba0a895137b630f5d308b123ef886d68090f855d (diff) | |
Try to fix mangled wx/std string conversions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dvdomatic.cc | 2 | ||||
| -rw-r--r-- | src/wx/job_wrapper.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 66f366a24..2ad41b2cb 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -328,7 +328,7 @@ private: } catch (std::exception& e) { wxString p = c->GetPath (); wxCharBuffer b = p.ToUTF8 (); - error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), e.what())); + error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what()))); } } diff --git a/src/wx/job_wrapper.cc b/src/wx/job_wrapper.cc index 8ddd3a348..ede11762c 100644 --- a/src/wx/job_wrapper.cc +++ b/src/wx/job_wrapper.cc @@ -35,8 +35,8 @@ JobWrapper::make_dcp (wxWindow* parent, shared_ptr<Film> film) try { film->make_dcp (); } catch (BadSettingError& e) { - error_dialog (parent, wxString::Format (_("Bad setting for %s (%s)"), e.setting().c_str(), e.what())); + error_dialog (parent, wxString::Format (_("Bad setting for %s (%s)"), std_to_wx (e.setting().c_str()), std_to_wx (e.what()))); } catch (std::exception& e) { - error_dialog (parent, wxString::Format (_("Could not make DCP: %s"), e.what ())); + error_dialog (parent, wxString::Format (_("Could not make DCP: %s"), std_to_wx (e.what ()))); } } |