diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-11 12:49:23 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-12 09:14:06 +0100 |
| commit | 94056bf7f8fdef32da3cd78eff68d58560b4e6be (patch) | |
| tree | 937fad363dc94d65ec20fa2ff7aa3b303310d80f /src/wx/wx_util.cc | |
| parent | 73654117144c6de0ec4efe39ddc88485df546cc9 (diff) | |
Replace incorrect uses of raw_convert with a new locale_convert.
Diffstat (limited to 'src/wx/wx_util.cc')
| -rw-r--r-- | src/wx/wx_util.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index e12443dd3..cb9f72a42 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -26,7 +26,7 @@ #include "file_picker_ctrl.h" #include "lib/config.h" #include "lib/util.h" -#include <dcp/raw_convert.h> +#include "lib/locale_convert.h" #include <wx/spinctrl.h> #include <boost/thread.hpp> @@ -365,17 +365,17 @@ setup_audio_channels_choice (wxChoice* choice, int minimum) vector<pair<string, string> > items; for (int i = minimum; i <= 16; i += 2) { if (i == 2) { - items.push_back (make_pair (wx_to_std (_("2 - stereo")), dcp::raw_convert<string> (i))); + items.push_back (make_pair (wx_to_std (_("2 - stereo")), locale_convert<string> (i))); } else if (i == 4) { - items.push_back (make_pair (wx_to_std (_("4 - L/C/R/Lfe")), dcp::raw_convert<string> (i))); + items.push_back (make_pair (wx_to_std (_("4 - L/C/R/Lfe")), locale_convert<string> (i))); } else if (i == 6) { - items.push_back (make_pair (wx_to_std (_("6 - 5.1")), dcp::raw_convert<string> (i))); + items.push_back (make_pair (wx_to_std (_("6 - 5.1")), locale_convert<string> (i))); } else if (i == 8) { - items.push_back (make_pair (wx_to_std (_("8 - 5.1/HI/VI")), dcp::raw_convert<string> (i))); + items.push_back (make_pair (wx_to_std (_("8 - 5.1/HI/VI")), locale_convert<string> (i))); } else if (i == 12) { - items.push_back (make_pair (wx_to_std (_("12 - 7.1/HI/VI")), dcp::raw_convert<string> (i))); + items.push_back (make_pair (wx_to_std (_("12 - 7.1/HI/VI")), locale_convert<string> (i))); } else { - items.push_back (make_pair (dcp::raw_convert<string> (i), dcp::raw_convert<string> (i))); + items.push_back (make_pair (locale_convert<string> (i), locale_convert<string> (i))); } } |