From 70d703255b4509d5f1c703233fb9dbec970d2790 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 22 Dec 2011 21:18:07 +0000
Subject: [PATCH] Skip unprocessed key events in the time edit control so that
 it doesn't eat hotkeys

Originally committed to SVN as r6055.
---
 aegisub/src/timeedit_ctrl.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/aegisub/src/timeedit_ctrl.cpp b/aegisub/src/timeedit_ctrl.cpp
index 5934bead7..641980a7c 100644
--- a/aegisub/src/timeedit_ctrl.cpp
+++ b/aegisub/src/timeedit_ctrl.cpp
@@ -224,11 +224,7 @@ void TimeEdit::OnKeyDown(wxKeyEvent &event) {
 	Refresh();
 
 	// Check if it's an acceptable key
-#ifdef __APPLE__
 	if (!event.CmdDown()) {
-#else
-	if (!event.ControlDown()) {
-#endif
 		if (byFrame || !insertMode || (key != WXK_BACK && key != WXK_DELETE)) {
 			// Reset selection first, if necessary
 			if (!byFrame && insertMode) {
@@ -241,17 +237,16 @@ void TimeEdit::OnKeyDown(wxKeyEvent &event) {
 			event.Skip();
 		}
 	}
-
 	else {
-		// Copy
 		if (key == 'C' || key == 'X') {
 			CopyTime();
 		}
-
-		// Paste
-		if (key == 'V') {
+		else if (key == 'V') {
 			PasteTime();
 		}
+		else {
+			event.Skip();
+		}
 	}
 }