From 8a0dce9cd0e7aff802571b93c3d3a8ad9ba7d1d1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 May 2008 23:53:11 +0000 Subject: [PATCH] fix handling of the commands with negative ids (e.g. created by NewControlId()) in MDI frames git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/mdi.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 4dd4bcc41c..5225e86be5 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -518,8 +518,11 @@ bool wxMDIParentFrame::HandleActivate(int state, bool minimized, WXHWND activate return processed; } -bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) +bool wxMDIParentFrame::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND hwnd) { + // sign extend to int from short before comparing with the other int ids + int id = (signed short)id_; + // In case it's e.g. a toolbar. if ( hwnd ) { @@ -1009,8 +1012,11 @@ WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message, return rc; } -bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd) +bool wxMDIChildFrame::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND hwnd) { + // sign extend to int from short before comparing with the other int ids + int id = (signed short)id_; + // In case it's e.g. a toolbar. if ( hwnd ) { -- 2.47.2