corrected eventobject setting for mouse events and capture

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 1c5d96ed76ea25fadf821161f42e04b37f01868b..8db3f7e902143b929de3273c07e21413c9e0cef5 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -429,6 +429,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr )
         wxTheApp->s_captureWindow->ScreenToClient( &x , &y ) ;
         event.m_x = x ;
         event.m_y = y ;
+        event.SetEventObject( wxTheApp->s_captureWindow ) ;
         wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ;
         
         if ( ev->what == mouseUp )

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index fd36642550f9751c6951f1ce355407c378a3077a..9d9fdb5cc6e1a2208b6bf25cb708a92df80dd327 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1417,6 +1417,7 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
 
     event.m_x = x ;
     event.m_y = y ;
+    event.SetEventObject( this ) ;
     
     if ( wxBusyCursorCount == 0 )
     {

diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp
index 1c5d96ed76ea25fadf821161f42e04b37f01868b..8db3f7e902143b929de3273c07e21413c9e0cef5 100644 (file)
--- a/src/mac/toplevel.cpp
+++ b/src/mac/toplevel.cpp
@@ -429,6 +429,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr )
         wxTheApp->s_captureWindow->ScreenToClient( &x , &y ) ;
         event.m_x = x ;
         event.m_y = y ;
+        event.SetEventObject( wxTheApp->s_captureWindow ) ;
         wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ;
         
         if ( ev->what == mouseUp )

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index fd36642550f9751c6951f1ce355407c378a3077a..9d9fdb5cc6e1a2208b6bf25cb708a92df80dd327 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -1417,6 +1417,7 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
 
     event.m_x = x ;
     event.m_y = y ;
+    event.SetEventObject( this ) ;
     
     if ( wxBusyCursorCount == 0 )
     {