empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mac OS X compile fixes

Browse source
This commit is contained in:
Ilari Liusvaara 2013-08-04 20:51:11 +03:00
parent 3cb5d08c86
commit e436cabd72
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/platform/macosx/joystick.cpp
View file

@ -25,7 +25,7 @@ namespace
uint64_t joyid = reinterpret_cast<size_t>(j);
joys[index] = j;
idx_to_jid[index] = lsnes_gamepads.add(j->name);
hw_gamepad& ngp = lsnes_gamepads[idx_to_jid[i]];
hw_gamepad& ngp = lsnes_gamepads[idx_to_jid[index]];
for(int i = 0; i < j->nbuttons; i++)
ngp.add_button(i, (stringfmt() << "Button #" << i).str());

24
src/platform/wxwidgets/settings-joysticks.cpp
View file

@ -22,19 +22,19 @@ namespace
wxSizer* top_s = new wxBoxSizer(wxVERTICAL);
SetSizer(top_s);
wxSizer* t_s = new wxFlexGridSizer(2);
t_s->Add(new wxStaticText(this, -1, "Minus:"));
t_s->Add(low = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxSize(100, -1)), 1, wxGROW);
t_s->Add(new wxStaticText(this, -1, "Center:"));
t_s->Add(mid = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxSize(100, -1)), 1, wxGROW);
t_s->Add(new wxStaticText(this, -1, "Plus:"));
t_s->Add(hi = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxSize(100, -1)), 1, wxGROW);
t_s->Add(new wxStaticText(this, -1, "Neutral:"));
t_s->Add(null = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxSize(100, -1)), 1, wxGROW);
t_s->Add(new wxStaticText(this, -1, "Threshold:"));
t_s->Add(thresh = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxSize(100, -1)), 1,
t_s->Add(new wxStaticText(this, -1, wxT("Minus:")));
t_s->Add(low = new wxTextCtrl(this, -1, wxT(""), wxDefaultPosition, wxSize(100, -1)), 1, wxGROW);
t_s->Add(new wxStaticText(this, -1, wxT("Center:")));
t_s->Add(mid = new wxTextCtrl(this, -1, wxT(""), wxDefaultPosition, wxSize(100, -1)), 1, wxGROW);
t_s->Add(new wxStaticText(this, -1, wxT("Plus:")));
t_s->Add(hi = new wxTextCtrl(this, -1, wxT(""), wxDefaultPosition, wxSize(100, -1)), 1, wxGROW);
t_s->Add(new wxStaticText(this, -1, wxT("Neutral:")));
t_s->Add(null = new wxTextCtrl(this, -1, wxT(""), wxDefaultPosition, wxSize(100, -1)), 1, wxGROW);
t_s->Add(new wxStaticText(this, -1, wxT("Threshold:")));
t_s->Add(thresh = new wxTextCtrl(this, -1, wxT(""), wxDefaultPosition, wxSize(100, -1)), 1,
wxGROW);
t_s->Add(_disabled = new wxCheckBox(this, -1, "Disabled"));
t_s->Add(_pressure = new wxCheckBox(this, -1, "Pressure"));
t_s->Add(_disabled = new wxCheckBox(this, -1, wxT("Disabled")));
t_s->Add(_pressure = new wxCheckBox(this, -1, wxT("Pressure")));
top_s->Add(t_s, 1, wxGROW);
low->SetValue(towxstring((stringfmt() << minus).str()));