piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 05:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use the global ::wxSetCursor instead of the local one from our panel object. Should close 3956."

Browse Source 
This reverts commit 884006e4c8.
This commit is contained in:
Ryan Houdek
2012-12-15 00:04:10 -06:00
parent 884006e4c8
commit 8838944cd3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -514,14 +514,14 @@ void CFrame::OnActive(wxActivateEvent& event)
m_RenderParent->SetFocus(); m_RenderParent->SetFocus();
#endif #endif
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor &&
Core::GetState() == Core::CORE_RUN) Core::GetState() == Core::CORE_RUN)
::wxSetCursor(cursor_transparent); m_RenderParent->SetCursor(cursor_transparent);
} }
else else
{ {
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
::wxSetCursor(wxNullCursor); m_RenderParent->SetCursor(wxNullCursor);
} }
} }
event.Skip(); event.Skip();

4
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -1055,7 +1055,7 @@ void CFrame::DoPause()
{ {
Core::SetState(Core::CORE_PAUSE); Core::SetState(Core::CORE_PAUSE);
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor) if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor)
::wxSetCursor(wxNullCursor); m_RenderParent->SetCursor(wxCURSOR_ARROW);
} }
else else
{ {
@ -1075,7 +1075,7 @@ void CFrame::DoPause()
Core::SetState(Core::CORE_RUN); Core::SetState(Core::CORE_RUN);
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor &&
RendererHasFocus()) RendererHasFocus())
::wxSetCursor(cursor_transparent); m_RenderParent->SetCursor(cursor_transparent);
} }
UpdateGUI(); UpdateGUI();
} }