Add wxDataViewCtrl::GetCurrentColumn().

[wxWidgets.git] / src / osx / cocoa / window.mm

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index 84f694dd02d076e608a1e1db6f75e6c2816fbb9e..b1906c4d1a603c1b3c1f28bc1c25ceae67607a27 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -1091,6 +1091,7 @@ bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, voi
         wxEvtHandler * const handler = m_wxPeer->GetEventHandler();
         
         wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+        command_event.SetEventObject( wxevent.GetEventObject() );
         handled = handler->ProcessEvent( command_event );
         
         if ( !handled )
@@ -2306,7 +2307,8 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
     if ( wxevent.GetEventType() == wxEVT_KEY_DOWN )
     {
         wxKeyEvent eventHook(wxEVT_CHAR_HOOK, wxevent);
-        if ( GetWXPeer()->OSXHandleKeyEvent(eventHook) )
+        if ( GetWXPeer()->OSXHandleKeyEvent(eventHook)
+                && !eventHook.IsNextEventAllowed() )
             return true;
     }