setting the correct event object for EVT_ENTER_WINDOW and EVT_LEAVE_WINDOW

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

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 76ab2b8675c852d5da0d547675045e584035ad2d..cd7e8d2423f29c1a3192e22f2232fe552b0fa93c 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -1764,6 +1764,7 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr )
                         wxMouseEvent eventleave(event);
                         eventleave.SetEventType( wxEVT_LEAVE_WINDOW );
                         wxWindow::s_lastMouseWindow->ScreenToClient( &eventleave.m_x, &eventleave.m_y );
                         wxMouseEvent eventleave(event);
                         eventleave.SetEventType( wxEVT_LEAVE_WINDOW );
                         wxWindow::s_lastMouseWindow->ScreenToClient( &eventleave.m_x, &eventleave.m_y );

+                        eventleave.SetEventObject( wxWindow::s_lastMouseWindow ) ;

                         
                         wxWindow::s_lastMouseWindow->GetEventHandler()->ProcessEvent(eventleave);
                     }
                         
                         wxWindow::s_lastMouseWindow->GetEventHandler()->ProcessEvent(eventleave);
                     }


@@ -1772,7 +1773,7 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr )
                         wxMouseEvent evententer(event);
                         evententer.SetEventType( wxEVT_ENTER_WINDOW );
                         currentMouseWindow->ScreenToClient( &evententer.m_x, &evententer.m_y );
                         wxMouseEvent evententer(event);
                         evententer.SetEventType( wxEVT_ENTER_WINDOW );
                         currentMouseWindow->ScreenToClient( &evententer.m_x, &evententer.m_y );

-                        
+                        evententer.SetEventObject( currentMouseWindow ) ;

                         currentMouseWindow->GetEventHandler()->ProcessEvent(evententer);
                     }
                     wxWindow::s_lastMouseWindow = currentMouseWindow ;
                         currentMouseWindow->GetEventHandler()->ProcessEvent(evententer);
                     }
                     wxWindow::s_lastMouseWindow = currentMouseWindow ;

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 76ab2b8675c852d5da0d547675045e584035ad2d..cd7e8d2423f29c1a3192e22f2232fe552b0fa93c 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1764,6 +1764,7 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr )
                         wxMouseEvent eventleave(event);
                         eventleave.SetEventType( wxEVT_LEAVE_WINDOW );
                         wxWindow::s_lastMouseWindow->ScreenToClient( &eventleave.m_x, &eventleave.m_y );
                         wxMouseEvent eventleave(event);
                         eventleave.SetEventType( wxEVT_LEAVE_WINDOW );
                         wxWindow::s_lastMouseWindow->ScreenToClient( &eventleave.m_x, &eventleave.m_y );

+                        eventleave.SetEventObject( wxWindow::s_lastMouseWindow ) ;

                         
                         wxWindow::s_lastMouseWindow->GetEventHandler()->ProcessEvent(eventleave);
                     }
                         
                         wxWindow::s_lastMouseWindow->GetEventHandler()->ProcessEvent(eventleave);
                     }


@@ -1772,7 +1773,7 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr )
                         wxMouseEvent evententer(event);
                         evententer.SetEventType( wxEVT_ENTER_WINDOW );
                         currentMouseWindow->ScreenToClient( &evententer.m_x, &evententer.m_y );
                         wxMouseEvent evententer(event);
                         evententer.SetEventType( wxEVT_ENTER_WINDOW );
                         currentMouseWindow->ScreenToClient( &evententer.m_x, &evententer.m_y );

-                        
+                        evententer.SetEventObject( currentMouseWindow ) ;

                         currentMouseWindow->GetEventHandler()->ProcessEvent(evententer);
                     }
                     wxWindow::s_lastMouseWindow = currentMouseWindow ;
                         currentMouseWindow->GetEventHandler()->ProcessEvent(evententer);
                     }
                     wxWindow::s_lastMouseWindow = currentMouseWindow ;