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

Merge pull request #4440 from lioncash/private 

GCAdapterConfigDiag: Make public functions private
This commit is contained in:
Markus Wick 2016-11-11 09:55:47 +01:00 committed by GitHub
parent c77d4a765d 2d9ef3412a
commit e8af48adfc
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/Config/GCAdapterConfigDiag.cpp
View File

@ -56,7 +56,7 @@ GCAdapterConfigDiag::GCAdapterConfigDiag(wxWindow* const parent, const wxString&
SetSizerAndFit(szr);
Center();
Bind(wxEVT_ADAPTER_UPDATE, &GCAdapterConfigDiag::UpdateAdapter, this);
Bind(wxEVT_ADAPTER_UPDATE, &GCAdapterConfigDiag::OnUpdateAdapter, this);
}
GCAdapterConfigDiag::~GCAdapterConfigDiag()
@ -69,7 +69,7 @@ void GCAdapterConfigDiag::ScheduleAdapterUpdate()
wxQueueEvent(this, new wxCommandEvent(wxEVT_ADAPTER_UPDATE));
}
void GCAdapterConfigDiag::UpdateAdapter(wxCommandEvent& ev)
void GCAdapterConfigDiag::OnUpdateAdapter(wxCommandEvent& WXUNUSED(event))
{
bool unpause = Core::PauseAndLock(true);
if (GCAdapter::IsDetected())

10
Source/Core/DolphinWX/Config/GCAdapterConfigDiag.h
View File

@ -14,13 +14,13 @@ public:
GCAdapterConfigDiag(wxWindow* const parent, const wxString& name, const int tab_num = 0);
~GCAdapterConfigDiag();
void ScheduleAdapterUpdate();
void UpdateAdapter(wxCommandEvent& ev);
private:
wxStaticText* m_adapter_status;
int m_pad_id;
void ScheduleAdapterUpdate();
void OnUpdateAdapter(wxCommandEvent& event);
void OnAdapterRumble(wxCommandEvent& event);
void OnAdapterKonga(wxCommandEvent& event);
wxStaticText* m_adapter_status;
int m_pad_id;
};