From f9dd509459630e2f933bcf04dcea59b3e031f05d Mon Sep 17 00:00:00 2001 From: ayuanx Date: Fri, 29 Jan 2010 03:11:29 +0000 Subject: [PATCH] Fixes Issue 2180 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4981 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp | 3 ++- Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp b/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp index 52e19a7201..1abfff1773 100644 --- a/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp +++ b/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp @@ -100,6 +100,7 @@ GCPadConfigDialog::GCPadConfigDialog(wxWindow *parent, wxWindowID id, const wxSt // Reset values g_Pressed = 0; + ClickedButton = NULL; GetButtonWaitingID = 0; GetButtonWaitingTimer = 0; @@ -186,7 +187,7 @@ void GCPadConfigDialog::SaveButtonMapping(int Id, int Key) void GCPadConfigDialog::OnKeyDown(wxKeyEvent& event) { - event.Skip(); + //event.Skip(); if(ClickedButton != NULL) { diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp index 57143a3e5f..1d62de21f4 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp @@ -117,9 +117,7 @@ WiimotePadConfigDialog::WiimotePadConfigDialog(wxWindow *parent, wxWindowID id, : wxDialog(parent, id, title, position, size, style) { m_ControlsCreated = false;; - m_Page = g_Config.CurrentPage; CreatePadGUIControls(); - m_Notebook->ChangeSelection(m_Page); #if wxUSE_TIMER m_ButtonMappingTimer = new wxTimer(this, IDTM_BUTTON); @@ -139,6 +137,8 @@ WiimotePadConfigDialog::WiimotePadConfigDialog(wxWindow *parent, wxWindowID id, } #endif + m_Page = g_Config.CurrentPage; + m_Notebook->ChangeSelection(m_Page); // Set control values UpdateGUI(); @@ -211,7 +211,7 @@ void WiimotePadConfigDialog::SaveButtonMapping(int Id, int Key) void WiimotePadConfigDialog::OnKeyDown(wxKeyEvent& event) { - event.Skip(); + //event.Skip(); if(ClickedButton != NULL) {