Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always use HWND first in WM_COMMAND handler to avoid mixing the controls with the same id

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-12-02 00:49:02 +00:00
parent 3f2474754a
commit 71292fab8d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/msw/window.cpp
View File

@@ -3536,19 +3536,21 @@ bool wxWindowMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
#endif // wxUSE_MENUS_NATIVE #endif // wxUSE_MENUS_NATIVE
wxWindow *win = NULL; wxWindow *win = NULL;
if ( cmd == 0 || cmd == 1 ) // menu or accel - use id
// first try to find it from HWND - this works even with the broken
// programs using the same ids for different controls
if ( control )
{
win = wxFindWinFromHandle(control);
}
// try the id
if ( !win )
{ {
// must cast to a signed type before comparing with other ids! // must cast to a signed type before comparing with other ids!
win = FindItem((signed short)id); win = FindItem((signed short)id);
} }
if ( !win && control )
{
// find it from HWND - this works even with the broken programs using
// the same ids for different controls
win = wxFindWinFromHandle(control);
}
if ( win ) if ( win )
{ {
return win->MSWCommand(cmd, id); return win->MSWCommand(cmd, id);