Revert "Use the global ::wxSetCursor instead of the local one from ou…

…r panel object. Should close 3956." This reverts commit 884006e.
dolphin-emu · Dec 15, 2012 · 8838944 · 8838944
1 parent 884006e
commit 8838944
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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();
 }