From ae4e8b63587ab2c7377bac120c63e3bb7e386b7d Mon Sep 17 00:00:00 2001 From: Gerik Kubiak Date: Tue, 17 Mar 2015 12:14:14 -0700 Subject: [PATCH] Changed screen to window. Moved UpdateGUI to a more general scope. --- Source/Core/DolphinWX/ConfigMain.cpp | 2 +- Source/Core/DolphinWX/Frame.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index 881ac768a0..fa666eae71 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -488,7 +488,7 @@ void CConfigMain::InitializeGUITooltips() ConfirmStop->SetToolTip(_("Show a confirmation box before stopping a game.")); UsePanicHandlers->SetToolTip(_("Show a message box when a potentially serious error has occurred.\nDisabling this may avoid annoying and non-fatal messages, but it may result in major crashes having no explanation at all.")); OnScreenDisplayMessages->SetToolTip(_("Display messages over the emulation screen area.\nThese messages include memory card writes, video backend and CPU information, and JIT cache clearing.")); - PauseOnFocusLost->SetToolTip(_("Pauses the emulator when focus is taken away from the emulation screen.")); + PauseOnFocusLost->SetToolTip(_("Pauses the emulator when focus is taken away from the emulation window.")); InterfaceLang->SetToolTip(_("Change the language of the user interface.\nRequires restart.")); diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index f96aa04267..b21bbd866d 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1188,8 +1188,6 @@ void CFrame::OnFocusChange(wxFocusEvent& event) if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) m_RenderParent->SetCursor(wxCURSOR_BLANK); } - UpdateGUI(); - } else { @@ -1200,8 +1198,8 @@ void CFrame::OnFocusChange(wxFocusEvent& event) m_RenderParent->SetCursor(wxNullCursor); Core::UpdateTitle(); } - UpdateGUI(); } + UpdateGUI(); } }