Improve the fix for the Ctrl+F6 cycle

This commit is contained in:
Paul Licameli 2016-06-30 11:00:34 -04:00
parent e9cf0a8335
commit 81228eac0e

View File

@ -149,17 +149,19 @@ public:
wxKeyEvent wxevent([event type] == NSKeyDown ? wxEVT_KEY_DOWN : wxEVT_KEY_UP);
impl->SetupKeyEvent(wxevent, event);
NSEvent *result;
if ([event type] == NSKeyDown)
{
wxKeyEvent eventHook(wxEVT_CHAR_HOOK, wxevent);
return FilterEvent(eventHook) == Event_Processed ? nil : event;
result = FilterEvent(eventHook) == Event_Processed ? nil : event;
}
else
{
return FilterEvent(wxevent) == Event_Processed ? nil : event;
result = FilterEvent(wxevent) == Event_Processed ? nil : event;
}
mEvent = nullptr;
return result;
}
}