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 #1336 from lioncash/ref 

TASInputDlg: Pass string by reference for CreateStickLayout
This commit is contained in:
Lioncash 2014-10-19 12:40:39 -04:00
parent b769331f50 656a2a16a3
commit 0b466c8a5e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinWX/TASInputDlg.cpp
View File

@ -102,7 +102,7 @@ void TASInputDlg::CreateWiiLayout()
m_controls[8] = &m_z_cont; m_controls[8] = &m_z_cont;
m_main_stick = CreateStick(ID_MAIN_STICK); m_main_stick = CreateStick(ID_MAIN_STICK);
wxStaticBoxSizer* const main_stick = CreateStickLayout(&m_main_stick, "IR"); wxStaticBoxSizer* const main_stick = CreateStickLayout(&m_main_stick, _("IR"));
m_main_stick.x_cont.default_value = 512; m_main_stick.x_cont.default_value = 512;
m_main_stick.y_cont.default_value = 384; m_main_stick.y_cont.default_value = 384;
@ -189,10 +189,10 @@ void TASInputDlg::CreateGCLayout()
wxBoxSizer* const top_box = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const top_box = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* const bottom_box = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const bottom_box = new wxBoxSizer(wxHORIZONTAL);
m_main_stick = CreateStick(ID_MAIN_STICK); m_main_stick = CreateStick(ID_MAIN_STICK);
wxStaticBoxSizer* const main_box = CreateStickLayout(&m_main_stick, "Main Stick"); wxStaticBoxSizer* const main_box = CreateStickLayout(&m_main_stick, _("Main Stick"));
m_c_stick = CreateStick(ID_C_STICK); m_c_stick = CreateStick(ID_C_STICK);
wxStaticBoxSizer* const c_box = CreateStickLayout(&m_c_stick, "C Stick"); wxStaticBoxSizer* const c_box = CreateStickLayout(&m_c_stick, _("C Stick"));
wxStaticBoxSizer* const shoulder_box = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Shoulder Buttons")); wxStaticBoxSizer* const shoulder_box = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Shoulder Buttons"));
m_l_cont = CreateControl(wxSL_VERTICAL | wxSL_INVERSE, -1, 100); m_l_cont = CreateControl(wxSL_VERTICAL | wxSL_INVERSE, -1, 100);
@ -281,9 +281,9 @@ TASInputDlg::Stick TASInputDlg::CreateStick(int id_stick)
return tempStick; return tempStick;
} }
wxStaticBoxSizer* TASInputDlg::CreateStickLayout(Stick* tempStick, std::string title) wxStaticBoxSizer* TASInputDlg::CreateStickLayout(Stick* tempStick, const wxString& title)
{ {
wxStaticBoxSizer* const temp_box = new wxStaticBoxSizer(wxHORIZONTAL, this, _(title)); wxStaticBoxSizer* const temp_box = new wxStaticBoxSizer(wxHORIZONTAL, this, title);
wxBoxSizer* const temp_xslider_box = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const temp_xslider_box = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* const temp_yslider_box = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const temp_yslider_box = new wxBoxSizer(wxVERTICAL);
wxBoxSizer* const temp_stick_box = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const temp_stick_box = new wxBoxSizer(wxVERTICAL);

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

@ -95,7 +95,7 @@ class TASInputDlg : public wxDialog
void SetButtonValue(Button* button, bool CurrentState); void SetButtonValue(Button* button, bool CurrentState);
void SetSliderValue(Control* control, int CurrentValue, int defaultValue = 128); void SetSliderValue(Control* control, int CurrentValue, int defaultValue = 128);
Stick CreateStick(int id_stick); Stick CreateStick(int id_stick);
wxStaticBoxSizer* CreateStickLayout(Stick* tempStick, std::string title); wxStaticBoxSizer* CreateStickLayout(Stick* tempStick, const wxString& title);
Button CreateButton(const std::string& name); Button CreateButton(const std::string& name);
Control CreateControl(long style, int width, int height, u32 range = 255); Control CreateControl(long style, int width, int height, u32 range = 255);