diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-03-01 17:58:04 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-03-01 17:58:04 +0000 |
| commit | 6ff79076d4a92dc6530a27e2a6cb3e07b6209821 (patch) | |
| tree | ff79392495f575d6767b9a66fbc302b2019f04f7 /src | |
| parent | e17fe32e21a73047d46acc0f88c977532d48a61d (diff) | |
Fix for wx 2.8.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dvdomatic.cc | 4 | ||||
| -rw-r--r-- | src/wx/config_dialog.cc | 4 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 4 | ||||
| -rw-r--r-- | src/wx/server_dialog.cc | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 5f06b6786..ab34924aa 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -446,8 +446,8 @@ setup_i18n () locale->AddCatalogLookupPathPrefix (wxT (LOCALE_PREFIX "/locale")); #endif - locale->AddCatalog ("libdvdomatic-wx"); - locale->AddCatalog ("dvdomatic"); + locale->AddCatalog (wxT ("libdvdomatic-wx")); + locale->AddCatalog (wxT ("dvdomatic")); if (!locale->IsOk()) { delete locale; diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index bf97d0d3a..b28c350ea 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -154,7 +154,7 @@ ConfigDialog::ConfigDialog (wxWindow* parent) _reference_scaler->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (ConfigDialog::reference_scaler_changed), 0, this); pair<string, string> p = Filter::ffmpeg_strings (config->reference_filters ()); - _reference_filters->SetLabel (std_to_wx (p.first + N_(" ") + p.second)); + _reference_filters->SetLabel (std_to_wx (p.first) + N_(" ") + std_to_wx (p.second)); _reference_filters_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (ConfigDialog::edit_reference_filters_clicked), 0, this); vector<ServerDescription*> servers = config->servers (); @@ -313,7 +313,7 @@ ConfigDialog::reference_filters_changed (vector<Filter const *> f) { Config::instance()->set_reference_filters (f); pair<string, string> p = Filter::ffmpeg_strings (Config::instance()->reference_filters ()); - _reference_filters->SetLabel (std_to_wx (p.first + N_(" ") + p.second)); + _reference_filters->SetLabel (std_to_wx (p.first) + N_(" ") + std_to_wx (p.second)); } void diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index b328f04c9..850466445 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -753,7 +753,7 @@ FilmEditor::set_film (shared_ptr<Film> f) if (_film) { FileChanged (_film->directory ()); } else { - FileChanged (N_("")); + FileChanged (wx_to_std (N_(""))); } film_changed (Film::NAME); @@ -1168,7 +1168,7 @@ FilmEditor::setup_dcp_name () { string s = _film->dcp_name (true); if (s.length() > 28) { - _dcp_name->SetLabel (std_to_wx (s.substr (0, 28) + N_("..."))); + _dcp_name->SetLabel (std_to_wx (s.substr (0, 28)) + N_("...")); _dcp_name->SetToolTip (std_to_wx (s)); } else { _dcp_name->SetLabel (std_to_wx (s)); diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc index 46e3f7127..7a9cf95c7 100644 --- a/src/wx/server_dialog.cc +++ b/src/wx/server_dialog.cc @@ -27,7 +27,7 @@ ServerDialog::ServerDialog (wxWindow* parent, ServerDescription* server) if (server) { _server = server; } else { - _server = new ServerDescription (N_("localhost"), 1); + _server = new ServerDescription (wx_to_std (N_("localhost")), 1); } wxFlexGridSizer* table = new wxFlexGridSizer (2, 4, 4); |