Remove all calls to wxKeyEvent::StopPropagation. Key events don't propagate by default and even if they did, events which are marked as processed don't propagate further.
Originally committed to SVN as r6046.
This commit is contained in:
parent
ed51e7b668
commit
a66cc26706
7 changed files with 2 additions and 12 deletions
|
@ -1194,12 +1194,9 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event)
|
||||||
|
|
||||||
void AudioDisplay::OnKeyDown(wxKeyEvent& event)
|
void AudioDisplay::OnKeyDown(wxKeyEvent& event)
|
||||||
{
|
{
|
||||||
if (!hotkey::check("Audio", context, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers()))
|
hotkey::check("Audio", context, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers());
|
||||||
event.Skip();
|
|
||||||
event.StopPropagation();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void AudioDisplay::OnSize(wxSizeEvent &)
|
void AudioDisplay::OnSize(wxSizeEvent &)
|
||||||
{
|
{
|
||||||
// We changed size, update the sub-controls' internal data and redraw
|
// We changed size, update the sub-controls' internal data and redraw
|
||||||
|
|
|
@ -975,7 +975,6 @@ bool BaseGrid::IsDisplayed(const AssDialogue *line) const {
|
||||||
}
|
}
|
||||||
|
|
||||||
void BaseGrid::OnKeyDown(wxKeyEvent &event) {
|
void BaseGrid::OnKeyDown(wxKeyEvent &event) {
|
||||||
event.StopPropagation();
|
|
||||||
if (hotkey::check("Subtitle Grid", context, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers()))
|
if (hotkey::check("Subtitle Grid", context, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers()))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -122,7 +122,6 @@ void DialogDetachedVideo::OnMinimize(wxIconizeEvent &event) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void DialogDetachedVideo::OnKeyDown(wxKeyEvent &evt) {
|
void DialogDetachedVideo::OnKeyDown(wxKeyEvent &evt) {
|
||||||
evt.StopPropagation();
|
|
||||||
hotkey::check("Video Display", context, evt.GetKeyCode(), evt.GetUnicodeKey(), evt.GetModifiers());
|
hotkey::check("Video Display", context, evt.GetKeyCode(), evt.GetUnicodeKey(), evt.GetModifiers());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -267,5 +267,4 @@ void DialogStyling::OnKeyDown(wxKeyEvent &evt) {
|
||||||
}
|
}
|
||||||
evt.Skip();
|
evt.Skip();
|
||||||
}
|
}
|
||||||
evt.StopPropagation();
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -256,7 +256,6 @@ void DialogTranslation::InsertOriginal() {
|
||||||
void DialogTranslation::OnKeyDown(wxKeyEvent &evt) {
|
void DialogTranslation::OnKeyDown(wxKeyEvent &evt) {
|
||||||
if (!hotkey::check("Translation Assistant", c, evt.GetKeyCode(), evt.GetUnicodeKey(), evt.GetModifiers()))
|
if (!hotkey::check("Translation Assistant", c, evt.GetKeyCode(), evt.GetUnicodeKey(), evt.GetModifiers()))
|
||||||
evt.Skip();
|
evt.Skip();
|
||||||
evt.StopPropagation();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void DialogTranslation::OnPlayVideoButton(wxCommandEvent &) {
|
void DialogTranslation::OnPlayVideoButton(wxCommandEvent &) {
|
||||||
|
|
|
@ -457,7 +457,6 @@ void SubsEditBox::UpdateFrameTiming(agi::vfr::Framerate const& fps) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void SubsEditBox::OnKeyDown(wxKeyEvent &event) {
|
void SubsEditBox::OnKeyDown(wxKeyEvent &event) {
|
||||||
event.StopPropagation();
|
|
||||||
if (hotkey::check("Subtitle Edit Box", c, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers()))
|
if (hotkey::check("Subtitle Edit Box", c, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers()))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -370,9 +370,7 @@ void VideoDisplay::OnContextMenu(wxContextMenuEvent&) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void VideoDisplay::OnKeyDown(wxKeyEvent &event) {
|
void VideoDisplay::OnKeyDown(wxKeyEvent &event) {
|
||||||
event.StopPropagation();
|
hotkey::check("Video", con, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers());
|
||||||
if (hotkey::check("Video", con, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers()))
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void VideoDisplay::SetZoom(double value) {
|
void VideoDisplay::SetZoom(double value) {
|
||||||
|
|
Loading…
Reference in a new issue