From a8780ad5bbd52c859eaeba01c2f739cbb15c1576 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Fri, 20 Jul 2007 05:40:54 +0000 Subject: [PATCH] Implement wxWindow::SetCursor to invalidate Cocoa's cursor rects. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cocoa/window.h | 2 ++ src/cocoa/window.mm | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/include/wx/cocoa/window.h b/include/wx/cocoa/window.h index b30b23ac1d..730790e563 100644 --- a/include/wx/cocoa/window.h +++ b/include/wx/cocoa/window.h @@ -142,6 +142,8 @@ public: virtual void SetFocus(); // Warp the pointer the given position virtual void WarpPointer(int x_pos, int y_pos) ; + // Change the window's cursor + virtual bool SetCursor( const wxCursor &cursor ); // Send the window a refresh event virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL); // Set/get the window's font diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm index 69689cbf72..23fee50c2a 100644 --- a/src/cocoa/window.mm +++ b/src/cocoa/window.mm @@ -669,6 +669,15 @@ bool wxWindowCocoa::Cocoa_resetCursorRects() return true; } +bool wxWindowCocoa::SetCursor(const wxCursor &cursor) +{ + if(!wxWindowBase::SetCursor(cursor)) + return false; + // Invalidate the cursor rects so the cursor will change + [[GetNSView() window] invalidateCursorRectsForView:GetNSView()]; + return true; +} + bool wxWindowCocoa::Cocoa_viewDidMoveToWindow() { wxLogTrace(wxTRACE_COCOA,wxT("wxWindow=%p::viewDidMoveToWindow"),this); -- 2.45.2