From a12546634d8d190b4b1503c5d6533971b26e5862 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 24 Mar 2005 22:29:30 +0000 Subject: [PATCH] fix handling Alt-key events in wxComboBox git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + src/msw/combobox.cpp | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/docs/changes.txt b/docs/changes.txt index d95e0d2d40..0f4e4b913c 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -34,6 +34,7 @@ wxMSW: - Added "orient" parameter to wxMDIParentFrame::Tile() - wxTextCtrl with wxTE_RICH2 style now uses RichEdit 4.1 if available +- fix handling Alt-key events in wxComboBox (reported by Joakim Roubert) wxGTK: diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 1fd9e0daa5..c15da2ee31 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -174,6 +174,9 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd, case WM_KEYUP: case WM_KEYDOWN: case WM_CHAR: + case WM_SYSCHAR: + case WM_SYSKEYDOWN: + case WM_SYSKEYUP: case WM_SETFOCUS: case WM_KILLFOCUS: { @@ -299,12 +302,16 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam) return true; } } + // fall through + case WM_SYSCHAR: return HandleChar(wParam, lParam, true /* isASCII */); + case WM_SYSKEYDOWN: case WM_KEYDOWN: return HandleKeyDown(wParam, lParam); + case WM_SYSKEYUP: case WM_KEYUP: return HandleKeyUp(wParam, lParam); -- 2.45.2