From 884006e4c8f43e7f4e6e67912f19c622b090be98 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 14 Dec 2012 15:19:22 -0600 Subject: [PATCH] Use the global ::wxSetCursor instead of the local one from our panel object. Should close 3956. --- Source/Core/DolphinWX/Src/Frame.cpp | 6 +++--- Source/Core/DolphinWX/Src/FrameTools.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index da6c565ddf..8f68d738b1 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -514,14 +514,14 @@ void CFrame::OnActive(wxActivateEvent& event) m_RenderParent->SetFocus(); #endif - if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && Core::GetState() == Core::CORE_RUN) - m_RenderParent->SetCursor(cursor_transparent); + ::wxSetCursor(cursor_transparent); } else { if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) - m_RenderParent->SetCursor(wxNullCursor); + ::wxSetCursor(wxNullCursor); } } event.Skip(); diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 98649be181..370f951807 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1055,7 +1055,7 @@ void CFrame::DoPause() { Core::SetState(Core::CORE_PAUSE); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) - m_RenderParent->SetCursor(wxCURSOR_ARROW); + ::wxSetCursor(wxNullCursor); } else { @@ -1075,7 +1075,7 @@ void CFrame::DoPause() Core::SetState(Core::CORE_RUN); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && RendererHasFocus()) - m_RenderParent->SetCursor(cursor_transparent); + ::wxSetCursor(cursor_transparent); } UpdateGUI(); }