From 9f3fd691e2d00a9fdb1afa53668633ebd3e419c2 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 6 Apr 2012 03:53:38 +0000
Subject: [PATCH] Unskip key events handled by the non-command keypress
 handling in BaseGrid

hotkey::check marks non-matching events as skipped, so the default key
event handler was running even if BaseGrid did something with the
keypress.

Closes #1464.

Originally committed to SVN as r6667.
---
 aegisub/src/base_grid.cpp                | 2 ++
 aegisub/src/dialog_styling_assistant.cpp | 1 -
 aegisub/src/video_slider.cpp             | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/aegisub/src/base_grid.cpp b/aegisub/src/base_grid.cpp
index a5fdac608..6fff3e29c 100644
--- a/aegisub/src/base_grid.cpp
+++ b/aegisub/src/base_grid.cpp
@@ -1008,6 +1008,8 @@ void BaseGrid::OnKeyDown(wxKeyEvent &event) {
 
 	// Moving
 	if (dir) {
+		event.Skip(false);
+
 		int old_extend = extendRow;
 		int next = mid(0, GetDialogueIndex(active_line) + dir * step, GetRows() - 1);
 		SetActiveLine(GetDialogue(next));
diff --git a/aegisub/src/dialog_styling_assistant.cpp b/aegisub/src/dialog_styling_assistant.cpp
index bf1e39fca..600a279f9 100644
--- a/aegisub/src/dialog_styling_assistant.cpp
+++ b/aegisub/src/dialog_styling_assistant.cpp
@@ -255,6 +255,5 @@ void DialogStyling::OnKeyDown(wxKeyEvent &evt) {
 			if (from > 0)
 				style_name->SetSelection(from - 1, to);
 		}
-		evt.Skip();
 	}
 }
diff --git a/aegisub/src/video_slider.cpp b/aegisub/src/video_slider.cpp
index 4b1d0d760..56c4b35c2 100644
--- a/aegisub/src/video_slider.cpp
+++ b/aegisub/src/video_slider.cpp
@@ -157,8 +157,6 @@ void VideoSlider::OnKeyDown(wxKeyEvent &event) {
 		c->subsGrid->GetEventHandler()->ProcessEvent(event);
 		c->subsGrid->SetFocus();
 	}
-	else
-		event.Skip();
 }
 
 void VideoSlider::OnPaint(wxPaintEvent &) {