From 0797a6f8754db982b87a1df63975ccf76df2905f Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Mon, 6 Jul 2015 23:54:22 +0200 Subject: [PATCH] Fix accessibility support in wxMSW. Return the correct result from handing WM_GETOBJECT message. Closes #17058. (this is a backport of 6a435345f53732ed2a40dccc302e7d1f137e5eaa from master) --- docs/changes.txt | 1 + src/msw/window.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index 2a68451820..78ebaf40e1 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -612,6 +612,7 @@ wxGTK: wxMSW: - Fix compilation with g++ 4.9 in non-C++11 mode. +- Fix regression in accessibility support (Leland Lucius). - Fix regression in wxDC drawing with bottom-to-top y axis (Artur Wieczorek). - Fix compilation with C++Builder XE compiler (Nichka). - Fix best height of wxSlider with labels but without ticks (Artur Wieczorek). diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 7943f62ff0..a14105125e 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -3386,7 +3386,8 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result, if (dwObjId == (LPARAM)OBJID_CLIENT && GetOrCreateAccessible()) { - return LresultFromObject(IID_IAccessible, wParam, (IUnknown*) GetAccessible()->GetIAccessible()); + processed = true; + rc.result = LresultFromObject(IID_IAccessible, wParam, (IUnknown*) GetAccessible()->GetIAccessible()); } break; }