RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-04-05 14:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implemented small tool for generating id of HLE-Function. Fixed small issue in PADManager dialog.

Browse source
This commit is contained in:
Oil 2014-04-09 23:57:26 +04:00
parent 8183ee4d56
commit 770ebaf271
10 changed files with 148 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rpcs3/Gui/PADManager.cpp
View file

@ -5,13 +5,12 @@ PADManager::PADManager(wxWindow* parent)
: wxDialog(parent, wxID_ANY, "PAD Settings", wxDefaultPosition)
, m_button_id(0)
, m_key_pressed(false)
, m_emu_paused(false)
{
bool paused = false;
if(Emu.IsRunning())
{
Emu.Pause();
paused = true;
m_emu_paused = true;
}
wxBoxSizer* s_panel(new wxBoxSizer(wxHORIZONTAL));
@ -246,8 +245,6 @@ PADManager::PADManager(wxWindow* parent)
Connect(b_ok->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
Connect(b_reset->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
Connect(b_cancel->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
if(paused) Emu.Resume();
}
void PADManager::OnKeyDown(wxKeyEvent &keyEvent)