diff --git a/aegisub/src/dialog_detached_video.cpp b/aegisub/src/dialog_detached_video.cpp index 27427faba..e6a098bc3 100644 --- a/aegisub/src/dialog_detached_video.cpp +++ b/aegisub/src/dialog_detached_video.cpp @@ -115,24 +115,10 @@ DialogDetachedVideo::~DialogDetachedVideo() { /////////////// // Event table BEGIN_EVENT_TABLE(DialogDetachedVideo,wxDialog) - EVT_KEY_DOWN(DialogDetachedVideo::OnKey) EVT_CLOSE(DialogDetachedVideo::OnClose) EVT_MOVE(DialogDetachedVideo::OnMove) END_EVENT_TABLE() - - -/// @brief Key down -/// @param event -/// -void DialogDetachedVideo::OnKey(wxKeyEvent &event) { - // Send to parent... except that it doesn't work - event.Skip(); - GetParent()->GetEventHandler()->ProcessEvent(event); -} - - - /// @brief Close window /// @param event /// diff --git a/aegisub/src/dialog_detached_video.h b/aegisub/src/dialog_detached_video.h index 0b20e509e..1f44c89e3 100644 --- a/aegisub/src/dialog_detached_video.h +++ b/aegisub/src/dialog_detached_video.h @@ -62,7 +62,6 @@ private: /// DOCME FrameMain *parent; - void OnKey(wxKeyEvent &event); void OnClose(wxCloseEvent &event); void OnMove(wxMoveEvent &event); diff --git a/aegisub/src/frame_main.h b/aegisub/src/frame_main.h index b3ef59aaf..8e4804c8a 100644 --- a/aegisub/src/frame_main.h +++ b/aegisub/src/frame_main.h @@ -194,7 +194,6 @@ private: void OnStatusClear(wxTimerEvent &event); void OnVideoPlay(wxCommandEvent &event); - void OnKeyDown(wxKeyEvent &event); void OnOpenRecentSubs (wxCommandEvent &event); void OnOpenRecentVideo (wxCommandEvent &event); diff --git a/aegisub/src/frame_main_events.cpp b/aegisub/src/frame_main_events.cpp index c2e431d1f..ccd9134c8 100644 --- a/aegisub/src/frame_main_events.cpp +++ b/aegisub/src/frame_main_events.cpp @@ -105,8 +105,6 @@ BEGIN_EVENT_TABLE(FrameMain, wxFrame) EVT_CLOSE(FrameMain::OnCloseWindow) - EVT_KEY_DOWN(FrameMain::OnKeyDown) - EVT_MENU_OPEN(FrameMain::OnMenuOpen) EVT_MENU_RANGE(Menu_File_Recent,Menu_File_Recent+99, FrameMain::OnOpenRecentSubs) EVT_MENU_RANGE(Menu_Video_Recent,Menu_Video_Recent+99, FrameMain::OnOpenRecentVideo) @@ -1783,18 +1781,6 @@ void FrameMain::OnStatusClear(wxTimerEvent &event) { SetStatusText(_T(""),1); } - - -/// @brief Key down -/// @param event -/// -void FrameMain::OnKeyDown(wxKeyEvent &event) { - audioBox->audioDisplay->GetEventHandler()->ProcessEvent(event); - event.Skip(); -} - - - /// @brief Next frame hotkey /// @param event ///