diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2012-12-15 00:04:10 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2012-12-15 00:04:10 -0600 |
| commit | 8838944cd360148b8aa30d7429b68596ca9e76c7 (patch) | |
| tree | 32ead253360f9d53bae771db35f5ad6777012972 /Source | |
| parent | 884006e4c8f43e7f4e6e67912f19c622b090be98 (diff) | |
Revert "Use the global ::wxSetCursor instead of the local one from our panel object. Should close 3956."
This reverts commit 884006e4c8f43e7f4e6e67912f19c622b090be98.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/Src/Frame.cpp | 6 | ||||
| -rw-r--r-- | 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 8f68d738b1..da6c565ddf 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) - ::wxSetCursor(cursor_transparent); + m_RenderParent->SetCursor(cursor_transparent); } else { if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) - ::wxSetCursor(wxNullCursor); + m_RenderParent->SetCursor(wxNullCursor); } } event.Skip(); diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 370f951807..98649be181 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) - ::wxSetCursor(wxNullCursor); + m_RenderParent->SetCursor(wxCURSOR_ARROW); } else { @@ -1075,7 +1075,7 @@ void CFrame::DoPause() Core::SetState(Core::CORE_RUN); if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && RendererHasFocus()) - ::wxSetCursor(cursor_transparent); + m_RenderParent->SetCursor(cursor_transparent); } UpdateGUI(); } |