mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-05-28 05:52:38 +00:00
Build (minor) > Fixed linux compilation errors
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4544 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
18450737be
commit
926ff36489
2 changed files with 5 additions and 5 deletions
|
@ -807,7 +807,7 @@ void PADConfigDialognJoy::CreateGUIControls()
|
|||
#ifdef _WIN32
|
||||
m_Joyname[i] = new wxComboBox(m_Controller[i], IDC_JOYNAME, wxEmptyString, wxDefaultPosition, wxSize(476, 21), 0, NULL, wxCB_READONLY);
|
||||
#else
|
||||
m_Joyname[i] = new wxComboBox(m_Controller[i], IDC_JOYNAME, arrayStringFor_Joyname[0], wxDefaultPosition, wxSize(450, 25), arrayStringFor_Joyname, 0, wxDefaultValidator, wxT("m_Joyname"));
|
||||
m_Joyname[i] = new wxComboBox(m_Controller[i], IDC_JOYNAME, wxEmptyString, wxDefaultPosition, wxSize(450, 25), 0, NULL, wxCB_READONLY);
|
||||
#endif
|
||||
|
||||
m_gJoyname[i] = new wxStaticBoxSizer (wxHORIZONTAL, m_Controller[i], wxT("Controller"));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue