Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid setting live cursor during busy state

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-02-28 14:39:37 +00:00
parent 4c00ce28bd
commit 201c6db3e4
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/osx/cocoa/window.mm
View File

@@ -2143,13 +2143,16 @@ void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* oth
void wxWidgetCocoaImpl::SetCursor(const wxCursor& cursor) void wxWidgetCocoaImpl::SetCursor(const wxCursor& cursor)
{ {
NSPoint location = [NSEvent mouseLocation]; if ( !wxIsBusy() )
location = [[m_osxView window] convertScreenToBase:location];
NSPoint locationInView = [m_osxView convertPoint:location fromView:nil];
if( NSMouseInRect(locationInView, [m_osxView bounds], YES) )
{ {
[(NSCursor*)cursor.GetHCURSOR() set]; NSPoint location = [NSEvent mouseLocation];
location = [[m_osxView window] convertScreenToBase:location];
NSPoint locationInView = [m_osxView convertPoint:location fromView:nil];
if( NSMouseInRect(locationInView, [m_osxView bounds], YES) )
{
[(NSCursor*)cursor.GetHCURSOR() set];
}
} }
[[m_osxView window] invalidateCursorRectsForView:m_osxView]; [[m_osxView window] invalidateCursorRectsForView:m_osxView];
} }