projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another try at the wxString / std / i18n confusions.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.cc
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index a7f370f00188c8acc8a65dee722783ee8680c75e..08eade4d0f020d59916c6ec12b4a8d78b9f4a3a7 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-105,7
+105,7
@@
FilmViewer::film_changed (Film::Property p)
try {
_decoders = decoder_factory (_film, o);
} catch (StringError& e) {
try {
_decoders = decoder_factory (_film, o);
} catch (StringError& e) {
- error_dialog (this,
std_to_wx (String::compose (wx_to_std (_("Could not open content file (%1)")), e.what()
)));
+ error_dialog (this,
wxString::Format (_("Could not open content file (%s)"), std_to_wx(e.what()).data(
)));
return;
}
return;
}
@@
-411,7
+411,7
@@
FilmViewer::get_frame ()
} catch (DecodeError& e) {
_play_button->SetValue (false);
check_play_state ();
} catch (DecodeError& e) {
_play_button->SetValue (false);
check_play_state ();
- error_dialog (this,
std_to_wx (String::compose (wx_to_std (_("Could not decode video for view (%1)")), e.what()
)));
+ error_dialog (this,
wxString::Format (_("Could not decode video for view (%s)"), std_to_wx(e.what()).data(
)));
}
}
}
}