Really fixed separator handling.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@25824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2004-02-15 17:35:55 +00:00
parent b46db46f30
commit fd035889c7

View File

@@ -304,11 +304,6 @@ bool wxMenu::DoInsertOrAppend(
m_bDoBreak = FALSE;
}
if (pItem->IsSeparator())
{
rItem.afStyle |= MIS_SEPARATOR;
}
//
// Id is the numeric id for normal menu items and HMENU for submenus as
// required by ::MM_INSERTITEM message API
@@ -344,8 +339,13 @@ bool wxMenu::DoInsertOrAppend(
pItem->m_vMenuData.afStyle = rItem.afStyle;
pItem->m_vMenuData.hItem = rItem.hItem;
}
else if (!pItem->IsSeparator())
else
#endif
if (pItem->IsSeparator())
{
rItem.afStyle = MIS_SEPARATOR;
}
else
{
//
// Menu is just a normal string (passed in data parameter)