Ensure that a wxMenuItem's parent menu is updated if it is removed
from one and added to another menu. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
13fd234c9c
commit
1e93ca1729
@ -49,6 +49,7 @@ public:
|
||||
|
||||
// the menu we're in
|
||||
wxMenu *GetMenu() const { return m_parentMenu; }
|
||||
void SetMenu(wxMenu* menu) { m_parentMenu = menu; }
|
||||
|
||||
// get/set id
|
||||
void SetId(int itemid) { m_id = itemid; }
|
||||
|
@ -319,6 +319,7 @@ bool wxMenuBase::DoAppend(wxMenuItem *item)
|
||||
wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Append()") );
|
||||
|
||||
m_items.Append(item);
|
||||
item->SetMenu((wxMenu*)this);
|
||||
if ( item->IsSubMenu() )
|
||||
{
|
||||
AddSubMenu(item->GetSubMenu());
|
||||
@ -352,6 +353,7 @@ bool wxMenuBase::DoInsert(size_t pos, wxMenuItem *item)
|
||||
wxCHECK_MSG( node, FALSE, wxT("invalid index in wxMenu::Insert()") );
|
||||
|
||||
m_items.Insert(node, item);
|
||||
item->SetMenu((wxMenu*)this);
|
||||
if ( item->IsSubMenu() )
|
||||
{
|
||||
AddSubMenu(item->GetSubMenu());
|
||||
@ -380,6 +382,7 @@ wxMenuItem *wxMenuBase::DoRemove(wxMenuItem *item)
|
||||
m_items.DeleteNode(node);
|
||||
|
||||
// item isn't attached to anything any more
|
||||
item->SetMenu((wxMenu *)NULL);
|
||||
wxMenu *submenu = item->GetSubMenu();
|
||||
if ( submenu )
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user