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

fix several problems in handling of the menu items with negative ids

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-17 20:38:07 +00:00
parent a368dde565
commit 660e7fda2c
4 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/msw/menu.cpp
View File

@@ -97,7 +97,7 @@ typedef struct tagMENUINFO
// ----------------------------------------------------------------------------
// the (popup) menu title has this special id
static const int idMenuTitle = -3;
static const UINT idMenuTitle = (UINT)-3;
// ----------------------------------------------------------------------------
// private functions
@@ -399,7 +399,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
flags |= MF_POPUP;
}
else {
id = pItem->GetId();
id = pItem->GetMSWId();
}
@@ -564,7 +564,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
// if we just appended the title, highlight it
if ( (int)id == idMenuTitle )
if ( id == idMenuTitle )
{
// visually select the menu title
SetDefaultMenuItem(GetHmenu(), id);
@@ -731,7 +731,7 @@ void wxMenu::SetTitle(const wxString& label)
if ( !label.empty() )
{
if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
(unsigned)idMenuTitle, m_title.wx_str()) ||
idMenuTitle, m_title.wx_str()) ||
!::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
{
wxLogLastError(wxT("InsertMenu"));
@@ -767,7 +767,7 @@ void wxMenu::SetTitle(const wxString& label)
#else
if ( !ModifyMenu(hMenu, 0u,
MF_BYPOSITION | MF_STRING,
(unsigned)idMenuTitle, m_title.wx_str()) )
idMenuTitle, m_title.wx_str()) )
{
wxLogLastError(wxT("ModifyMenu"));
}
@@ -779,7 +779,7 @@ void wxMenu::SetTitle(const wxString& label)
// put the title string in bold face
if ( !m_title.empty() )
{
SetDefaultMenuItem(GetHmenu(), (UINT)idMenuTitle);
SetDefaultMenuItem(GetHmenu(), idMenuTitle);
}
#endif // Win32
}