X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/719493e14bd4c9222e64da2006ec496e7c0ba7b1..19874feb47e6bf7faab318c525e1d77a19e9db57:/src/stc/ScintillaWX.cpp?ds=sidebyside diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 779ac2a3df..565bfabb2c 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -21,6 +21,11 @@ #include "PlatWX.h" #include +#ifdef __WXMSW__ + // GetHwndOf() + #include +#endif + //---------------------------------------------------------------------- // Helper classes @@ -841,7 +846,7 @@ int ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed) bool shift = evt.ShiftDown(), ctrl = evt.ControlDown(), alt = evt.AltDown(); - + if (ctrl && key >= 1 && key <= 26) key += 'A' - 1; @@ -861,6 +866,7 @@ int ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed) case WXK_ESCAPE: key = SCK_ESCAPE; break; case WXK_BACK: key = SCK_BACK; break; case WXK_TAB: key = SCK_TAB; break; + case WXK_NUMPAD_ENTER: // fall through case WXK_RETURN: key = SCK_RETURN; break; case WXK_ADD: // fall through case WXK_NUMPAD_ADD: key = SCK_ADD; break;