diff --git a/aegisub/src/dialog_kara_timing_copy.cpp b/aegisub/src/dialog_kara_timing_copy.cpp index 6c546aed7..5aa707246 100644 --- a/aegisub/src/dialog_kara_timing_copy.cpp +++ b/aegisub/src/dialog_kara_timing_copy.cpp @@ -76,9 +76,7 @@ enum { BUTTON_KTSKIPSOURCE, BUTTON_KTSKIPDEST, BUTTON_KTGOBACK, - BUTTON_KTACCEPT, - TEXT_SOURCE, - TEXT_DEST + BUTTON_KTACCEPT }; /// DOCME @@ -726,8 +724,6 @@ BEGIN_EVENT_TABLE(DialogKanjiTimer,wxDialog) EVT_BUTTON(BUTTON_KTGOBACK,DialogKanjiTimer::OnGoBack) EVT_BUTTON(BUTTON_KTACCEPT,DialogKanjiTimer::OnAccept) EVT_KEY_DOWN(DialogKanjiTimer::OnKeyDown) - EVT_TEXT_ENTER(TEXT_SOURCE,DialogKanjiTimer::OnKeyEnter) - EVT_TEXT_ENTER(TEXT_DEST,DialogKanjiTimer::OnKeyEnter) END_EVENT_TABLE() void DialogKanjiTimer::OnClose(wxCommandEvent &) { @@ -823,26 +819,16 @@ void DialogKanjiTimer::OnKeyDown(wxKeyEvent &event) { display->DecreaseSourceMatch(); break; case WXK_RETURN : - OnKeyEnter(evt); + if (display->GetRemainingSource() == 0 && display->GetRemainingDestination() == 0) + OnAccept(evt); + else + OnLink(evt); break; default : event.Skip(); } } -void DialogKanjiTimer::OnKeyEnter(wxCommandEvent &) { - wxCommandEvent evt; - - if (display->GetRemainingSource() == 0 && display->GetRemainingDestination() == 0) - { - OnAccept(evt); - } - else - { - OnLink(evt); - } -} - void DialogKanjiTimer::ResetForNewLine() { AssDialogue *src = 0; diff --git a/aegisub/src/dialog_kara_timing_copy.h b/aegisub/src/dialog_kara_timing_copy.h index e8fa602bb..49008f441 100644 --- a/aegisub/src/dialog_kara_timing_copy.h +++ b/aegisub/src/dialog_kara_timing_copy.h @@ -90,7 +90,6 @@ class DialogKanjiTimer : public wxDialog { void OnSkipDest(wxCommandEvent &event); void OnGoBack(wxCommandEvent &event); void OnAccept(wxCommandEvent &event); - inline void OnKeyEnter(wxCommandEvent &event); void OnKeyDown(wxKeyEvent &event); void ResetForNewLine();