piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change Wiimote padconfig and recording wxframes to modal dialogs. (Works better for linux)

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3688 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
LPFaint99
2009-07-06 00:27:32 +00:00
parent 8fe9db180c
commit 23f3e327e2
6 changed files with 21 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp
View File

@ -35,7 +35,7 @@ enum TriggerType
CTL_TRIGGER_XINPUT
};
BEGIN_EVENT_TABLE(WiimotePadConfigDialog,wxFrame)
BEGIN_EVENT_TABLE(WiimotePadConfigDialog,wxDialog)
EVT_CLOSE(WiimotePadConfigDialog::OnClose)
EVT_BUTTON(ID_CLOSE, WiimotePadConfigDialog::CloseClick)
EVT_BUTTON(ID_APPLY, WiimotePadConfigDialog::CloseClick)
@ -92,7 +92,7 @@ END_EVENT_TABLE()
WiimotePadConfigDialog::WiimotePadConfigDialog(wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &position, const wxSize& size, long style)
: wxFrame(parent, id, title, position, size, style)
: wxDialog(parent, id, title, position, size, style)
{
#if wxUSE_TIMER
m_ButtonMappingTimer = new wxTimer(this, IDTM_BUTTON);
@ -194,9 +194,7 @@ void WiimotePadConfigDialog::OnClose(wxCloseEvent& event)
if(m_UpdatePad)
m_UpdatePad->Stop();
g_Config.Save();
Hide();
if(!m_BasicConfigFrame->Closing)
m_BasicConfigFrame->Close();
event.Skip();
}
void WiimotePadConfigDialog::CloseClick(wxCommandEvent& event)
@ -1024,7 +1022,7 @@ void WiimotePadConfigDialog::CreatePadGUIControls()
m_Apply = new wxButton(this, ID_APPLY, wxT("Apply"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
m_Apply = new wxButton(this, ID_APPLY, wxT("Apply"));
m_Close = new wxButton(this, ID_CLOSE, wxT("Close"));
m_Close->SetToolTip(wxT("Apply and Close"));