diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2013-03-29 00:49:07 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2013-03-29 00:49:07 +0100 |
| commit | 57d4ba8dcca69e26a7897a90a4c01b5922d276b1 (patch) | |
| tree | 47bd045f33336b5228a928a065093bdd81fc5cbb /Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp | |
| parent | bad4f7f790b6038450488d1c23d8b65329cea4b4 (diff) | |
| parent | 40d919b352a553913f2c1e93e9fa39f2b968b04b (diff) | |
Merge branch 'master' into new-ax-hle
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp index bd085a3edf..e7122d2f71 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp @@ -34,7 +34,7 @@ IntegerSetting<T>::IntegerSetting(wxWindow* parent, const wxString& label, T& se VideoConfigDialog::VideoConfigDialog(wxWindow* parent, const std::string& title, const std::string& _ininame) : wxDialog(parent, -1, - wxString(wxT("Dolphin ")).append(wxString::FromAscii(title.c_str())).append(wxT(" Graphics Configuration")), + wxString(wxT("Dolphin ")).append(StrToWxStr(title)).append(wxT(" Graphics Configuration")), wxDefaultPosition, wxDefaultSize), vconfig(g_SWVideoConfig), ininame(_ininame) @@ -64,10 +64,10 @@ VideoConfigDialog::VideoConfigDialog(wxWindow* parent, const std::string& title, it = g_available_video_backends.begin(), itend = g_available_video_backends.end(); for (; it != itend; ++it) - choice_backend->AppendString(wxString::FromAscii((*it)->GetName().c_str())); + choice_backend->AppendString(StrToWxStr((*it)->GetName())); // TODO: How to get the translated plugin name? - choice_backend->SetStringSelection(wxString::FromAscii(g_video_backend->GetName().c_str())); + choice_backend->SetStringSelection(StrToWxStr(g_video_backend->GetName())); choice_backend->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDialog::Event_Backend, this); szr_rendering->Add(label_backend, 1, wxALIGN_CENTER_VERTICAL, 5); |