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

Small cleanup. Pad configuration *should* work on my Linux machine now. I'll verify it tomorrow. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3422 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY 2009-06-13 11:59:58 +00:00
parent c1b18457c4
commit 92ef5e144a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
View File

@ -173,7 +173,7 @@ IVolume::ECountry CVolumeWiiCrypted::GetCountry() const
break; // SDK break; // SDK
default: default:
PanicAlert(StringFromFormat("Unknown Country Code!").c_str()); PanicAlert("Unknown Country Code!");
break; break;
} }

10
Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp
View File

@ -76,6 +76,11 @@ ConfigDialog::ConfigDialog(wxWindow *parent, wxWindowID id, const wxString &titl
ClickedButton = NULL; ClickedButton = NULL;
CreateGUIControls(); CreateGUIControls();
Fit(); Fit();
// Connect keydown to the window
wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN,
wxKeyEventHandler(ConfigDialog::OnKeyDown),
(wxObject*)NULL, this);
} }
ConfigDialog::~ConfigDialog() ConfigDialog::~ConfigDialog()
@ -376,10 +381,7 @@ void ConfigDialog::OnButtonClick(wxCommandEvent& event)
oldLabel = ClickedButton->GetLabel(); oldLabel = ClickedButton->GetLabel();
ClickedButton->SetLabel(_("Press Key")); ClickedButton->SetLabel(_("Press Key"));
// Connect EVT_KEY_DOWN to OnKeyDown() ClickedButton->SetWindowStyle(wxWANTS_CHARS);
ClickedButton->Connect(wxID_ANY, wxEVT_KEY_DOWN,
wxKeyEventHandler(ConfigDialog::OnKeyDown),
(wxObject*)NULL, this);
} }
void ConfigDialog::OnCloseClick(wxCommandEvent& event) void ConfigDialog::OnCloseClick(wxCommandEvent& event)