piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -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

36
Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.cpp
View File

@ -67,33 +67,21 @@ WiimoteBasicConfigDialog::WiimoteBasicConfigDialog(wxWindow *parent, wxWindowID
UpdateGUI();
}
WiimoteBasicConfigDialog::~WiimoteBasicConfigDialog(){}
void WiimoteBasicConfigDialog::OnClose(wxCloseEvent& event)
{
g_FrameOpen = false;
g_Config.Save();
if ((m_PadConfigFrame && m_PadConfigFrame->IsShown()) || (m_RecordingConfigFrame && m_RecordingConfigFrame->IsShown()))
if (m_PadConfigFrame)
{
Closing = false;
Hide();
m_PadConfigFrame->EndModal(wxID_CLOSE);
m_PadConfigFrame = NULL;
}
else
if (m_RecordingConfigFrame)
{
Closing = true;
if (m_PadConfigFrame)
{
m_PadConfigFrame->Close();
m_PadConfigFrame = NULL;
}
if (m_RecordingConfigFrame)
{
m_RecordingConfigFrame->Close();
m_RecordingConfigFrame = NULL;
}
if (!g_EmulatorRunning) Shutdown();
m_RecordingConfigFrame->EndModal(wxID_CLOSE);
m_RecordingConfigFrame = NULL;
}
if (!g_EmulatorRunning) Shutdown();
// This will let the Close() function close and remove the wxDialog
event.Skip();
}
@ -135,14 +123,14 @@ void WiimoteBasicConfigDialog::ButtonClick(wxCommandEvent& event)
if (!m_PadConfigFrame)
m_PadConfigFrame = new WiimotePadConfigDialog(this);
if (!m_PadConfigFrame->IsShown())
m_PadConfigFrame->Show();
m_PadConfigFrame->ShowModal();
break;
case ID_BUTTONRECORDING:
if (!m_RecordingConfigFrame)
m_RecordingConfigFrame = new WiimoteRecordingConfigDialog(this);
if (!m_RecordingConfigFrame->IsShown())
m_RecordingConfigFrame->Show();
m_RecordingConfigFrame->ShowModal();
break;
}
}
@ -297,7 +285,7 @@ void WiimoteBasicConfigDialog::CreateGUIControls()
m_ButtonMapping = new wxButton(this, ID_BUTTONMAPPING, wxT("Button Mapping"));
m_Recording = new wxButton(this, ID_BUTTONRECORDING, wxT("Recording"));
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"));
@ -374,9 +362,7 @@ void WiimoteBasicConfigDialog::DoUseReal()
}
}
// ===================================================
/* Generate connect/disconnect status event */
// ----------------
// Generate connect/disconnect status event
void WiimoteBasicConfigDialog::DoExtensionConnectedDisconnected(int Extension)
{
// There is no need for this if no game is running