From 27540ba3fb9b7370c7f623f61a62b01718792cc4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 1 Dec 2014 15:47:38 -0500 Subject: [PATCH] InputConfigDiag: Clean up dialog title translation handling --- Source/Core/DolphinWX/ControllerConfigDiag.cpp | 4 ++-- Source/Core/DolphinWX/InputConfigDiag.cpp | 4 ++-- Source/Core/DolphinWX/InputConfigDiag.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp index bca01cc339..66fedf31d1 100644 --- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp +++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp @@ -362,7 +362,7 @@ void ControllerConfigDiag::ConfigEmulatedWiimote(wxCommandEvent& ev) Wiimote::Initialize(reinterpret_cast(GetHandle())); #endif } - InputConfigDialog m_ConfigFrame(this, *wiimote_plugin, _trans("Dolphin Emulated Wiimote Configuration"), m_wiimote_index_from_conf_bt_id[ev.GetId()]); + InputConfigDialog m_ConfigFrame(this, *wiimote_plugin, _("Dolphin Emulated Wiimote Configuration"), m_wiimote_index_from_conf_bt_id[ev.GetId()]); m_ConfigFrame.ShowModal(); m_ConfigFrame.Destroy(); if (!was_init) // if game isn't running @@ -486,7 +486,7 @@ void ControllerConfigDiag::OnGameCubeConfigButton(wxCommandEvent& event) #endif } - InputConfigDialog m_ConfigFrame(this, *pad_plugin, _trans("Dolphin GCPad Configuration"), port_num); + InputConfigDialog m_ConfigFrame(this, *pad_plugin, _("Dolphin GCPad Configuration"), port_num); m_ConfigFrame.ShowModal(); m_ConfigFrame.Destroy(); diff --git a/Source/Core/DolphinWX/InputConfigDiag.cpp b/Source/Core/DolphinWX/InputConfigDiag.cpp index 745417845e..bcecfa39e0 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/InputConfigDiag.cpp @@ -1050,8 +1050,8 @@ GamepadPage::GamepadPage(wxWindow* parent, InputConfig& config, const unsigned i }; -InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputConfig& config, const std::string& name, const int tab_num) - : wxDialog(parent, wxID_ANY, wxGetTranslation(StrToWxStr(name)), wxPoint(128,-1)) +InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputConfig& config, const wxString& name, const int tab_num) + : wxDialog(parent, wxID_ANY, name, wxPoint(128,-1)) , m_config(config) { m_pad_notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT); diff --git a/Source/Core/DolphinWX/InputConfigDiag.h b/Source/Core/DolphinWX/InputConfigDiag.h index 68694dc1e1..01c00d2403 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.h +++ b/Source/Core/DolphinWX/InputConfigDiag.h @@ -223,7 +223,7 @@ private: class InputConfigDialog : public wxDialog { public: - InputConfigDialog(wxWindow* const parent, InputConfig& config, const std::string& name, const int tab_num = 0); + InputConfigDialog(wxWindow* const parent, InputConfig& config, const wxString& name, const int tab_num = 0); //~InputConfigDialog(); bool Destroy() override;