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

use wxWindow::NewControlId() instead of wxNewId() to avoid clashes with user-defined ids; bug fixes in wxMSW for negative menu and toolbar items ids

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-09-20 22:58:55 +00:00
parent 5bd01f2048
commit 0edeeb6d96
11 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/window.cpp
View File

@@ -4871,8 +4871,11 @@ bool wxWindowMSW::HandleGetMinMaxInfo(void *WXUNUSED_IN_WINCE(mmInfo))
// command messages
// ---------------------------------------------------------------------------
bool wxWindowMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
bool wxWindowMSW::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND control)
{
// sign extend to int from short before comparing with the other int ids
int id = (signed short)id_;
#if wxUSE_MENUS_NATIVE
if ( !cmd && wxCurrentPopupMenu )
{
@@ -4895,8 +4898,7 @@ bool wxWindowMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
// try the id
if ( !win )
{
// must cast to a signed type before comparing with other ids!
win = FindItem((signed short)id);
win = FindItem(id);
}
if ( win )