From 3b6eff0b442d313b1d6b93ffee4baf553d91de1b Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Wed, 4 May 2016 15:54:07 +0200 Subject: [PATCH] Changed Cut/Copy/Paste event forwarding logic to avoid deadlocks in future --- ZRCola/zrcolafrm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ZRCola/zrcolafrm.cpp b/ZRCola/zrcolafrm.cpp index d3bc8e2..5d87d4b 100644 --- a/ZRCola/zrcolafrm.cpp +++ b/ZRCola/zrcolafrm.cpp @@ -203,7 +203,7 @@ void wxZRColaFrame::OnExit(wxCommandEvent& event) void wxZRColaFrame::OnForwardEventUpdate(wxUpdateUIEvent& event) { wxControl *focusWnd = wxDynamicCast(FindFocus(), wxControl); - if (focusWnd && !m_toolbarCompose->IsDescendant(focusWnd)) + if (focusWnd && focusWnd->IsKindOf(wxCLASSINFO(wxTextCtrl))) focusWnd->GetEventHandler()->ProcessEvent(event); else event.Enable(false);