From b4c0df15e0e6f3f8dfff68969272836abb47eddb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 27 Nov 2011 19:50:49 +0000
Subject: [PATCH] Set Unicode key code correctly for key events for WXK_RETURN
 in wxMSW.

WXK_RETURN is an ASCII character so return it from wxKeyEvent::GetUnicodeKey()
for EVT_KEY_{DOWN,UP} events, especially as it was already done for EVT_CHAR
ones.

See #13558.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/window.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 758590069e..9773f02c84 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -6316,6 +6316,9 @@ int VKToWX(WXWORD vk, WXLPARAM lParam, wchar_t *uc)
             // don't use ChooseNormalOrExtended() here as the keys are reversed
             // here: numpad enter is the extended one
             wxk = HIWORD(lParam) & KF_EXTENDED ? WXK_NUMPAD_ENTER : WXK_RETURN;
+
+            if ( uc )
+                *uc = WXK_RETURN;
             break;
 
         default:
-- 
2.45.2