summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Frame.cpp
diff options
context:
space:
mode:
authoraldelaro5 <aldelaro5@gmail.com>2016-10-27 21:50:09 -0400
committeraldelaro5 <aldelaro5@gmail.com>2016-10-28 20:03:35 -0400
commitee201455a8810803a9966b951815143786a0767d (patch)
tree4c490517ee685f988dcd13c807785a20c00ddf28 /Source/Core/DolphinWX/Frame.cpp
parent2005b4430fa91a89da35e39b356317a72cf86cf0 (diff)
Move UiHasFocus into DolphinApp
Using a wxEVT_ACTIVATE_APP event.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
-rw-r--r--Source/Core/DolphinWX/Frame.cpp18
1 files changed, 2 insertions, 16 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index c0e09ebdfb..a07586ad9c 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -504,10 +504,10 @@ void CFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
// Events
void CFrame::OnActive(wxActivateEvent& event)
{
- m_bHasFocus = (event.GetActive() && event.GetEventObject() == m_RenderFrame);
+ m_bRendererHasFocus = (event.GetActive() && event.GetEventObject() == m_RenderFrame);
if (Core::GetState() == Core::CORE_RUN || Core::GetState() == Core::CORE_PAUSE)
{
- if (m_bHasFocus)
+ if (m_bRendererHasFocus)
{
if (SConfig::GetInstance().bRenderToMain)
m_RenderParent->SetFocus();
@@ -779,20 +779,6 @@ bool CFrame::RendererHasFocus()
return m_bRendererHasFocus;
}
-// Returns true any time any one of our UI windows
-// has the focus, including any dialogs or other windows.
-bool CFrame::UIHasFocus()
-{
- // UIHasFocus should return true any time any one of our UI
- // windows has the focus, including any dialogs or other windows.
- //
- // wxWindow::FindFocus() returns the current wxWindow which has
- // focus. If it's not one of our windows, then it will return
- // null.
-
- return m_bHasFocus;
-}
-
void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event))
{
// Show all platforms and regions if...