The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-11 08:39:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2878 from lioncash/funcs

Browse Source 
Frame/TASInputDlg: Remove unused functions
This commit is contained in:
flacs 2015-08-20 02:51:09 +02:00
commit 4fb48fd209
4 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinWX/Frame.cpp
View File

@ -1075,16 +1075,6 @@ void WiiTASManipFunction(u8* data, WiimoteEmu::ReportFeatures rptf, int controll
} }
} }
bool TASInputHasFocus()
{
for (int i = 0; i < 8; ++i)
{
if (main_frame->g_TASInputDlg[i]->TASHasFocus())
return true;
}
return false;
}
void CFrame::OnKeyDown(wxKeyEvent& event) void CFrame::OnKeyDown(wxKeyEvent& event)
{ {
// On OS X, we claim all keyboard events while // On OS X, we claim all keyboard events while

1
Source/Core/DolphinWX/Frame.h
View File

@ -355,5 +355,4 @@ void OnStoppedCallback();
// For TASInputDlg // For TASInputDlg
void GCTASManipFunction(GCPadStatus* PadStatus, int controllerID); void GCTASManipFunction(GCPadStatus* PadStatus, int controllerID);
void WiiTASManipFunction(u8* data, WiimoteEmu::ReportFeatures rptf, int controllerID, int ext, const wiimote_key key); void WiiTASManipFunction(u8* data, WiimoteEmu::ReportFeatures rptf, int controllerID, int ext, const wiimote_key key);
bool TASInputHasFocus();
extern int g_saveSlot; extern int g_saveSlot;

19
Source/Core/DolphinWX/TASInputDlg.cpp
View File

@ -929,25 +929,6 @@ void TASInputDlg::OnCloseWindow(wxCloseEvent& event)
} }
} }
bool TASInputDlg::TASHasFocus()
{
if (!m_has_layout)
return false;
//allows numbers to be used as hotkeys
for (Control* const control : m_controls)
{
if (control != nullptr && wxWindow::FindFocus() == control->text)
return false;
}
if (wxWindow::FindFocus() == this)
return true;
else if (wxWindow::FindFocus() != nullptr && wxWindow::FindFocus()->GetParent() == this)
return true;
else
return false;
}
TASInputDlg::Stick* TASInputDlg::FindStickByID(int id) TASInputDlg::Stick* TASInputDlg::FindStickByID(int id)
{ {
if (id == ID_MAIN_STICK) if (id == ID_MAIN_STICK)

1
Source/Core/DolphinWX/TASInputDlg.h
View File

@ -45,7 +45,6 @@ class TASInputDlg : public wxDialog
void GetKeyBoardInput(u8* data, WiimoteEmu::ReportFeatures rptf, int ext, const wiimote_key key); void GetKeyBoardInput(u8* data, WiimoteEmu::ReportFeatures rptf, int ext, const wiimote_key key);
bool TextBoxHasFocus(); bool TextBoxHasFocus();
void SetLandRTriggers(); void SetLandRTriggers();
bool TASHasFocus();
void CreateGCLayout(); void CreateGCLayout();
void CreateWiiLayout(int num); void CreateWiiLayout(int num);
wxBitmap CreateStickBitmap(int x, int y); wxBitmap CreateStickBitmap(int x, int y);