From e21c3504727e8211c5cc6c9e51fe07b5f9fb3ffc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 6 Jul 2008 14:04:15 +0000 Subject: [PATCH] avoid duplicated command events if a wxFrame-level handler called event.Skip() (#4757) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/frame.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 19a148224f..df3b206afc 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -1053,7 +1053,12 @@ WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPara UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam, &id, &hwnd, &cmd); - processed = HandleCommand(id, cmd, (WXHWND)hwnd); + HandleCommand(id, cmd, (WXHWND)hwnd); + + // don't pass WM_COMMAND to the base class as it would generate + // another wxCommandEvent which would result in its handler + // being called twice if it uses event.Skip() + processed = true; } break;