From 6d63e2fc1689eaf28387eff7e836f49ebb62da51 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 29 Dec 2004 07:12:32 +0000 Subject: [PATCH] moving cursor update AFTER the mouse event handling, otherwise things like eg drawing a splitter from right to left leads to wrong cursor, because - at the time of the cursos update - the splitter is not yet move below the mouse pos. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/toplevel.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index c689ec0943..659e5ba78e 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -509,18 +509,6 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev wxevent.SetEventObject( currentMouseWindow ) ; - // update cursor - - wxWindow* cursorTarget = currentMouseWindow ; - wxPoint cursorPoint( wxevent.m_x , wxevent.m_y ) ; - - while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) ) - { - cursorTarget = cursorTarget->GetParent() ; - if ( cursorTarget ) - cursorPoint += cursorTarget->GetPosition() ; - } - // make tooltips current #if wxUSE_TOOLTIPS @@ -568,6 +556,19 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev wxTheApp->s_captureWindow = NULL ; // update cursor ? } + + // update cursor + + wxWindow* cursorTarget = currentMouseWindow ; + wxPoint cursorPoint( wxevent.m_x , wxevent.m_y ) ; + + while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) ) + { + cursorTarget = cursorTarget->GetParent() ; + if ( cursorTarget ) + cursorPoint += cursorTarget->GetPosition() ; + } + } // else if ( currentMouseWindow ) else { -- 2.45.2