wxMSW doesn't send CHAR events for Caps/Scroll/NumLock neither

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index b01523546d0b1712bd9394c4a055c14972bb05cf..91dc43d63d099bd310e3de941055aac6fa204154 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -61,6 +61,9 @@ All (GUI):
 - wxEvtHandler cannot be copied/assigned any longer - this never worked but
   now it results in compile-time error instead of run-time crashes
 
+- WXK_NUMLOCK and WXK_SCROLL keys no longer result in EVT_CHAR() events,
+  they only generate EVT_KEY_DOWN/UP() ones
+
 wxMSW:
 
 - build system changed: setup.h is not a static file in include/wx any more

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 8808c8e64f291ce147224b2dbb6c4243d7c78ddf..b7ed11bbb67ced9f68befaf653daf92bbe48b74c 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2491,15 +2491,19 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
                 break;
             }
 
-            // we consider these message "not interesting" to OnChar
-            if ( wParam == VK_SHIFT || wParam == VK_CONTROL )
-            {
-                processed = TRUE;
-                break;
-            }
-
             switch ( wParam )
             {
+                // we consider these message "not interesting" to OnChar, so
+                // just don't do anything more with them
+                case VK_SHIFT:
+                case VK_CONTROL:
+                case VK_MENU:
+                case VK_CAPITAL:
+                case VK_NUMLOCK:
+                case VK_SCROLL:
+                    processed = TRUE;
+                    break;
+
                 // avoid duplicate messages to OnChar for these ASCII keys:
                 // they will be translated by TranslateMessage() and received
                 // in WM_CHAR
@@ -2544,10 +2548,6 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
                     break;
 #endif // VK_APPS
 
-                case VK_LEFT:
-                case VK_RIGHT:
-                case VK_DOWN:
-                case VK_UP:
                 default:
                     if ( m_lastKeydownProcessed )
                     {