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

wxMenu::Insert() seems to work, bug in wxMenuBase::Insert() is corrected

Browse Source 
(inserting an item at pos == GetCount() should be the same as appending and
not an error)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-12-04 14:10:31 +00:00
parent f03ec224dc
commit 32db328c7a
6 changed files with 74 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/menucmn.cpp
View File

@@ -153,10 +153,18 @@ bool wxMenuBase::DoAppend(wxMenuItem *item)
bool wxMenuBase::Insert(size_t pos, wxMenuItem *item)
{
wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Insert") );
wxCHECK_MSG( pos < GetMenuItemCount(), FALSE,
wxT("invalid index in wxMenu::Insert") );
return DoInsert(pos, item);
if ( pos == GetMenuItemCount() )
{
return DoAppend(item);
}
else
{
wxCHECK_MSG( pos < GetMenuItemCount(), FALSE,
wxT("invalid index in wxMenu::Insert") );
return DoInsert(pos, item);
}
}
bool wxMenuBase::DoInsert(size_t pos, wxMenuItem *item)
@@ -487,16 +495,23 @@ bool wxMenuBarBase::Append(wxMenu *menu, const wxString& WXUNUSED(title))
}
bool wxMenuBarBase::Insert(size_t pos, wxMenu *menu,
const wxString& WXUNUSED(title))
const wxString& title)
{
wxCHECK_MSG( menu, FALSE, wxT("can't insert NULL menu") );
if ( pos == m_menus.GetCount() )
{
return Append(menu, title);
}
else
{
wxCHECK_MSG( menu, FALSE, wxT("can't insert NULL menu") );
wxMenuList::Node *node = m_menus.Item(pos);
wxCHECK_MSG( node, FALSE, wxT("bad index in wxMenuBar::Insert()") );
wxMenuList::Node *node = m_menus.Item(pos);
wxCHECK_MSG( node, FALSE, wxT("bad index in wxMenuBar::Insert()") );
m_menus.Insert(node, menu);
m_menus.Insert(node, menu);
return TRUE;
return TRUE;
}
}
wxMenu *wxMenuBarBase::Replace(size_t pos, wxMenu *menu,