From 1a65fc65866c0d1cb3d4a270b2c96240c8fd7ead Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 8 Apr 2002 14:05:49 +0000 Subject: [PATCH] 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 --- docs/changes.txt | 3 +++ src/msw/window.cpp | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index b01523546d..91dc43d63d 100644 --- 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 8808c8e64f..b7ed11bbb6 100644 --- 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 ) { -- 2.49.0