mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

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.

Browse source 
Originally committed to SVN as r6046.
This commit is contained in:
Thomas Goyne 2011-12-22 21:16:43 +00:00
parent ed51e7b668
commit a66cc26706
7 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
aegisub/src/audio_display.cpp
View file

@ -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

1
aegisub/src/base_grid.cpp
View file

@ -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;

1
aegisub/src/dialog_detached_video.cpp
View file

@ -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());
}

1
aegisub/src/dialog_styling_assistant.cpp
View file

@ -267,5 +267,4 @@ void DialogStyling::OnKeyDown(wxKeyEvent &evt) {
}
evt.Skip();
}
evt.StopPropagation();
}

1
aegisub/src/dialog_translation.cpp
View file

@ -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 &) {

1
aegisub/src/subs_edit_box.cpp
View file

@ -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;

4
aegisub/src/video_display.cpp
View file

@ -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) {