ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1628 from lioncash/tl 

InputConfigDiag: Clean up dialog title translation handling
This commit is contained in:
Ryan Houdek 2014-12-01 20:40:49 -06:00
parent b34c80d138 27540ba3fb
commit 64124a0d21
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/ControllerConfigDiag.cpp
View File

@ -362,7 +362,7 @@ void ControllerConfigDiag::ConfigEmulatedWiimote(wxCommandEvent& ev)
Wiimote::Initialize(reinterpret_cast<void*>(GetHandle())); Wiimote::Initialize(reinterpret_cast<void*>(GetHandle()));
#endif #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.ShowModal();
m_ConfigFrame.Destroy(); m_ConfigFrame.Destroy();
if (!was_init) // if game isn't running if (!was_init) // if game isn't running
@ -486,7 +486,7 @@ void ControllerConfigDiag::OnGameCubeConfigButton(wxCommandEvent& event)
#endif #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.ShowModal();
m_ConfigFrame.Destroy(); m_ConfigFrame.Destroy();

4
Source/Core/DolphinWX/InputConfigDiag.cpp
View File

@ -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) InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputConfig& config, const wxString& name, const int tab_num)
: wxDialog(parent, wxID_ANY, wxGetTranslation(StrToWxStr(name)), wxPoint(128,-1)) : wxDialog(parent, wxID_ANY, name, wxPoint(128,-1))
, m_config(config) , m_config(config)
{ {
m_pad_notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT); m_pad_notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT);

2
Source/Core/DolphinWX/InputConfigDiag.h
View File

@ -223,7 +223,7 @@ private:
class InputConfigDialog : public wxDialog class InputConfigDialog : public wxDialog
{ {
public: 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(); //~InputConfigDialog();
bool Destroy() override; bool Destroy() override;