From 05c964e6d60cef5a6d49f69213b50f1720468f2f Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 19 Mar 2012 07:39:04 -0700 Subject: [PATCH] wxw3: OSX can use the same method of hiding cursors as MSW --- Source/Core/DolphinWX/Src/Frame.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index a089562743..d8ed54087f 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -504,20 +504,21 @@ void CFrame::OnActive(wxActivateEvent& event) // We want all transparent, so we can just use the same buffer for // the "image" as for the transparency mask static const char cursor_data[32 * 32] = { 0 }; - -#ifdef __WXMSW__ - wxBitmap cursor_bitmap(cursor_data, 32, 32); - cursor_bitmap.SetMask(new wxMask(cursor_bitmap)); - wxCursor cursor_transparent = wxCursor(cursor_bitmap.ConvertToImage()); - - ::SetFocus((HWND)m_RenderParent->GetHandle()); -#else + +#ifdef __WXGTK__ wxCursor cursor_transparent = wxCursor(cursor_data, 32, 32, 6, 14, cursor_data, wxWHITE, wxBLACK); m_RenderParent->SetFocus(); +#else + wxBitmap cursor_bitmap(cursor_data, 32, 32); + cursor_bitmap.SetMask(new wxMask(cursor_bitmap)); + wxCursor cursor_transparent = wxCursor(cursor_bitmap.ConvertToImage()); +#ifdef __WXMSW__ + ::SetFocus((HWND)m_RenderParent->GetHandle()); #endif - +#endif + if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor && Core::GetState() == Core::CORE_RUN) m_RenderParent->SetCursor(cursor_transparent);