Merge pull request #1628 from lioncash/tl

InputConfigDiag: Clean up dialog title translation handling
dolphin-emu · Dec 2, 2014 · 64124a0 · 64124a0
2 parents b34c80d + 27540ba
commit 64124a0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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<void*>(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
@@ -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
@@ -223,7 +223,7 @@ class GamepadPage : public wxPanel
 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;