From 53a95b3af2cdb0ed093b3cc46f6ff22da3b426b3 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Sat, 4 Aug 2007 09:23:21 +0000 Subject: [PATCH] Issue #386 - Fixed setting of hotkeys to enter. Originally committed to SVN as r1469. --- aegisub/dialog_options.cpp | 2 +- aegisub/frame_main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aegisub/dialog_options.cpp b/aegisub/dialog_options.cpp index 558451ec4..96ba2542e 100644 --- a/aegisub/dialog_options.cpp +++ b/aegisub/dialog_options.cpp @@ -1023,7 +1023,7 @@ DialogInputHotkey::DialogInputHotkey(HotkeyType *_key,wxString name) //////////////////////// // Capturer constructor CaptureKey::CaptureKey(DialogInputHotkey *_parent) -: wxTextCtrl(_parent,-1,_T(""),wxDefaultPosition,wxSize(0,0)) +: wxTextCtrl(_parent,-1,_T(""),wxDefaultPosition,wxSize(0,0),wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB) { parent = _parent; SetFocus(); diff --git a/aegisub/frame_main.cpp b/aegisub/frame_main.cpp index d007894d6..d2c755607 100644 --- a/aegisub/frame_main.cpp +++ b/aegisub/frame_main.cpp @@ -1220,7 +1220,7 @@ void FrameMain::StatusTimeout(wxString text,int ms) { // Setup accelerator table void FrameMain::SetAccelerators() { std::vector entry; - entry.reserve(20); + entry.reserve(32); // Standard entry.push_back(Hotkeys.GetAccelerator(_T("Video global prev frame"),Video_Prev_Frame));