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

trying to solve cursor update problems with AUI, refs #15072

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2013-03-10 14:20:36 +00:00
parent 0c5a056a84
commit f1d0d07d2a
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1227,9 +1227,14 @@ bool wxWidgetCocoaImpl::SetupCursor(WX_NSEvent event)
while ( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) ) while ( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
{ {
// at least in GTK cursor events are not propagated either ...
#if 1
cursorTarget = NULL;
#else
cursorTarget = cursorTarget->GetParent() ; cursorTarget = cursorTarget->GetParent() ;
if ( cursorTarget ) if ( cursorTarget )
cursorPoint += cursorTarget->GetPosition(); cursorPoint += cursorTarget->GetPosition();
#endif
} }
return cursorTarget != NULL; return cursorTarget != NULL;

2
src/osx/window_osx.cpp
View File

@@ -1814,6 +1814,8 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt )
if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) ) if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
{ {
wxSetCursorEvent event( pt.x , pt.y ); wxSetCursorEvent event( pt.x , pt.y );
event.SetId(GetId());
event.SetEventObject(this);
bool processedEvtSetCursor = HandleWindowEvent(event); bool processedEvtSetCursor = HandleWindowEvent(event);
if ( processedEvtSetCursor && event.HasCursor() ) if ( processedEvtSetCursor && event.HasCursor() )