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

no message

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-08-21 11:08:33 +00:00
parent deb818d619
commit 760ac9abdd
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/os2/menu.cpp
View File

@@ -275,7 +275,7 @@ bool wxMenu::DoInsertOrAppend(
//
wxMenu* pSubmenu = pItem->GetSubMenu();
MENUITEM &rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:
MENUITEM& rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:
pItem->m_vMenuData;
if(pSubmenu != NULL)
{
@@ -296,7 +296,7 @@ bool wxMenu::DoInsertOrAppend(
if (pItem->IsSeparator())
{
vItem.afStyle |= MIS_SEPARATOR;
rItem.afStyle |= MIS_SEPARATOR;
}
//
@@ -304,20 +304,18 @@ bool wxMenu::DoInsertOrAppend(
// required by ::MM_INSERTITEM message API
//
wxMenu* pSubmenu = pItem->GetSubMenu();
if (pSubmenu != NULL)
{
wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
pSubmenu->SetParent(this);
vItem.iPosition = 0; // submenus have a 0 position
vItem.id = (USHORT)pSubmenu->GetHMenu();
vItem.afStyle |= MIS_SUBMENU | MIS_TEXT;
rItem.iPosition = 0; // submenus have a 0 position
rItem.id = (USHORT)pSubmenu->GetHMenu();
rItem.afStyle |= MIS_SUBMENU | MIS_TEXT;
}
else
{
vItem.id = pItem->GetId();
rItem.id = pItem->GetId();
}
BYTE* pData;
@@ -340,7 +338,7 @@ bool wxMenu::DoInsertOrAppend(
//
// Menu is just a normal string (passed in data parameter)
//
vItem.afStyle |= MIS_TEXT;
rItem.afStyle |= MIS_TEXT;
pData = (char*)pItem->GetText().c_str();
}