X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a188ac2988b6fedeead7a809124b8eaa2290c020..178c77606f3186250b42685ca752d0bc34cd02e9:/src/richtext/richtextctrl.cpp diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp index d51fffcc73..c46eafc11a 100644 --- a/src/richtext/richtextctrl.cpp +++ b/src/richtext/richtextctrl.cpp @@ -692,23 +692,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) if (event.GetEventType() == wxEVT_KEY_DOWN) { - if (event.GetKeyCode() == WXK_LEFT || - event.GetKeyCode() == WXK_RIGHT || - event.GetKeyCode() == WXK_UP || - event.GetKeyCode() == WXK_DOWN || - event.GetKeyCode() == WXK_HOME || - event.GetKeyCode() == WXK_PAGEUP || - event.GetKeyCode() == WXK_PAGEDOWN || - event.GetKeyCode() == WXK_END || - - event.GetKeyCode() == WXK_NUMPAD_LEFT || - event.GetKeyCode() == WXK_NUMPAD_RIGHT || - event.GetKeyCode() == WXK_NUMPAD_UP || - event.GetKeyCode() == WXK_NUMPAD_DOWN || - event.GetKeyCode() == WXK_NUMPAD_HOME || - event.GetKeyCode() == WXK_NUMPAD_PAGEUP || - event.GetKeyCode() == WXK_NUMPAD_PAGEDOWN || - event.GetKeyCode() == WXK_NUMPAD_END) + if (event.IsKeyInCategory(WXK_CATEGORY_NAVIGATION)) { KeyboardNavigate(event.GetKeyCode(), flags); return; @@ -784,7 +768,6 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event) case WXK_NUMPAD_END: case WXK_NUMPAD_BEGIN: case WXK_NUMPAD_INSERT: - case WXK_NUMPAD_DELETE: case WXK_WINDOWS_LEFT: { return; @@ -3512,7 +3495,7 @@ wxRichTextCaret::~wxRichTextCaret() void wxRichTextCaret::DoShow() { m_flashOn = true; - + if (!m_timer.IsRunning()) m_timer.Start(GetBlinkTime());