diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp index 349acecc2..964e9dceb 100644 --- a/aegisub/src/audio_display.cpp +++ b/aegisub/src/audio_display.cpp @@ -1194,12 +1194,9 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event) void AudioDisplay::OnKeyDown(wxKeyEvent& event) { - if (!hotkey::check("Audio", context, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers())) - event.Skip(); - event.StopPropagation(); + hotkey::check("Audio", context, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers()); } - void AudioDisplay::OnSize(wxSizeEvent &) { // We changed size, update the sub-controls' internal data and redraw diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp index d3e81c6c7..e1d744335 100644 --- a/aegisub/src/base_grid.cpp +++ b/aegisub/src/base_grid.cpp @@ -975,7 +975,6 @@ bool BaseGrid::IsDisplayed(const AssDialogue *line) const { } void BaseGrid::OnKeyDown(wxKeyEvent &event) { - event.StopPropagation(); if (hotkey::check("Subtitle Grid", context, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers())) return; diff --git a/aegisub/src/dialog_detached_video.cpp b/aegisub/src/dialog_detached_video.cpp index d468dd4f0..c9abc5836 100644 --- a/aegisub/src/dialog_detached_video.cpp +++ b/aegisub/src/dialog_detached_video.cpp @@ -122,7 +122,6 @@ void DialogDetachedVideo::OnMinimize(wxIconizeEvent &event) { } void DialogDetachedVideo::OnKeyDown(wxKeyEvent &evt) { - evt.StopPropagation(); hotkey::check("Video Display", context, evt.GetKeyCode(), evt.GetUnicodeKey(), evt.GetModifiers()); } diff --git a/aegisub/src/dialog_styling_assistant.cpp b/aegisub/src/dialog_styling_assistant.cpp index c0bc2f09b..cf64e9163 100644 --- a/aegisub/src/dialog_styling_assistant.cpp +++ b/aegisub/src/dialog_styling_assistant.cpp @@ -267,5 +267,4 @@ void DialogStyling::OnKeyDown(wxKeyEvent &evt) { } evt.Skip(); } - evt.StopPropagation(); } diff --git a/aegisub/src/dialog_translation.cpp b/aegisub/src/dialog_translation.cpp index fad9d4924..206f4806b 100644 --- a/aegisub/src/dialog_translation.cpp +++ b/aegisub/src/dialog_translation.cpp @@ -256,7 +256,6 @@ void DialogTranslation::InsertOriginal() { void DialogTranslation::OnKeyDown(wxKeyEvent &evt) { if (!hotkey::check("Translation Assistant", c, evt.GetKeyCode(), evt.GetUnicodeKey(), evt.GetModifiers())) evt.Skip(); - evt.StopPropagation(); } void DialogTranslation::OnPlayVideoButton(wxCommandEvent &) { diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp index f6a3a594e..694ef6993 100644 --- a/aegisub/src/subs_edit_box.cpp +++ b/aegisub/src/subs_edit_box.cpp @@ -457,7 +457,6 @@ void SubsEditBox::UpdateFrameTiming(agi::vfr::Framerate const& fps) { } void SubsEditBox::OnKeyDown(wxKeyEvent &event) { - event.StopPropagation(); if (hotkey::check("Subtitle Edit Box", c, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers())) return; diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp index 99c015637..6e97fd8ac 100644 --- a/aegisub/src/video_display.cpp +++ b/aegisub/src/video_display.cpp @@ -370,9 +370,7 @@ void VideoDisplay::OnContextMenu(wxContextMenuEvent&) { } void VideoDisplay::OnKeyDown(wxKeyEvent &event) { - event.StopPropagation(); - if (hotkey::check("Video", con, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers())) - return; + hotkey::check("Video", con, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers()); } void VideoDisplay::SetZoom(double value) {