From a08b2965fc59b66ebaeff72c5a54616664e13cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 26 Sep 2014 14:42:46 +0000 Subject: [PATCH] Fix handling of MSWWindowProc return value for menu events git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/window.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index a8176b0103..c5e3ed4e1c 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -3498,8 +3498,11 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result, // compatibility requirements on wx-3.0 make it simpler to just forward // the messages to the wxTLW. wxWindow *tlw = wxGetTopLevelParent(this); - if ( tlw && tlw != this ) - processed = tlw->MSWWindowProc(message, wParam, lParam); + if (tlw && tlw != this) + { + rc.result = tlw->MSWWindowProc(message, wParam, lParam); + processed = rc.result == 0; + } } break; #endif // !__WXMICROWIN__