Changed Cut/Copy/Paste event forwarding logic to avoid deadlocks in future

This commit is contained in:
Simon Rozman 2016-05-04 15:54:07 +02:00
parent 9a2bc6b743
commit 3b6eff0b44

View File

@ -203,7 +203,7 @@ void wxZRColaFrame::OnExit(wxCommandEvent& event)
void wxZRColaFrame::OnForwardEventUpdate(wxUpdateUIEvent& event) void wxZRColaFrame::OnForwardEventUpdate(wxUpdateUIEvent& event)
{ {
wxControl *focusWnd = wxDynamicCast(FindFocus(), wxControl); wxControl *focusWnd = wxDynamicCast(FindFocus(), wxControl);
if (focusWnd && !m_toolbarCompose->IsDescendant(focusWnd)) if (focusWnd && focusWnd->IsKindOf(wxCLASSINFO(wxTextCtrl)))
focusWnd->GetEventHandler()->ProcessEvent(event); focusWnd->GetEventHandler()->ProcessEvent(event);
else else
event.Enable(false); event.Enable(false);