diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index f0125f7fa2..d367f94c9b 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -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) { // On OS X, we claim all keyboard events while diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index 9b1374fec0..31eeb2745a 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -355,5 +355,4 @@ void OnStoppedCallback(); // For TASInputDlg void GCTASManipFunction(GCPadStatus* PadStatus, int controllerID); void WiiTASManipFunction(u8* data, WiimoteEmu::ReportFeatures rptf, int controllerID, int ext, const wiimote_key key); -bool TASInputHasFocus(); extern int g_saveSlot; diff --git a/Source/Core/DolphinWX/TASInputDlg.cpp b/Source/Core/DolphinWX/TASInputDlg.cpp index 2a95bdc57c..042aa2673c 100644 --- a/Source/Core/DolphinWX/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/TASInputDlg.cpp @@ -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) { if (id == ID_MAIN_STICK) diff --git a/Source/Core/DolphinWX/TASInputDlg.h b/Source/Core/DolphinWX/TASInputDlg.h index 83897817bc..a25a6c4c7c 100644 --- a/Source/Core/DolphinWX/TASInputDlg.h +++ b/Source/Core/DolphinWX/TASInputDlg.h @@ -45,7 +45,6 @@ class TASInputDlg : public wxDialog void GetKeyBoardInput(u8* data, WiimoteEmu::ReportFeatures rptf, int ext, const wiimote_key key); bool TextBoxHasFocus(); void SetLandRTriggers(); - bool TASHasFocus(); void CreateGCLayout(); void CreateWiiLayout(int num); wxBitmap CreateStickBitmap(int x, int y);