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

Make sure we call SetEventObject before firing events.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-03-05 19:21:32 +00:00
parent 16747764fb
commit 540f444554
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1344,6 +1344,7 @@ bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text)
{ {
wxKeyEvent wxevent(wxEVT_KEY_DOWN); wxKeyEvent wxevent(wxEVT_KEY_DOWN);
SetupKeyEvent( wxevent, event, text ); SetupKeyEvent( wxevent, event, text );
wxevent.SetEventObject(GetWXPeer());
return GetWXPeer()->OSXHandleKeyEvent(wxevent); return GetWXPeer()->OSXHandleKeyEvent(wxevent);
} }
@@ -1352,7 +1353,7 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
{ {
wxKeyEvent wxevent(wxEVT_KEY_DOWN); wxKeyEvent wxevent(wxEVT_KEY_DOWN);
SetupKeyEvent( wxevent, event ); SetupKeyEvent( wxevent, event );
wxevent.SetEventObject(GetWXPeer());
bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent); bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent);
// this will fire higher level events, like insertText, to help // this will fire higher level events, like insertText, to help
@@ -1372,6 +1373,7 @@ bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
wxPoint pt = wxFromNSPoint( m_osxView, clickLocation ); wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );
wxMouseEvent wxevent(wxEVT_LEFT_DOWN); wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
SetupMouseEvent( wxevent , event ) ; SetupMouseEvent( wxevent , event ) ;
wxevent.SetEventObject(GetWXPeer());
wxevent.m_x = pt.x; wxevent.m_x = pt.x;
wxevent.m_y = pt.y; wxevent.m_y = pt.y;