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

Ensure that a wxMenuItem's parent menu is updated if it is removed

Browse Source 
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:
Robin Dunn
2003-06-10 23:48:46 +00:00
parent 13fd234c9c
commit 1e93ca1729
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/menuitem.h
View File

@@ -49,6 +49,7 @@ public:
// the menu we're in // the menu we're in
wxMenu *GetMenu() const { return m_parentMenu; } wxMenu *GetMenu() const { return m_parentMenu; }
void SetMenu(wxMenu* menu) { m_parentMenu = menu; }
// get/set id // get/set id
void SetId(int itemid) { m_id = itemid; } void SetId(int itemid) { m_id = itemid; }

3
src/common/menucmn.cpp
View File

@@ -319,6 +319,7 @@ bool wxMenuBase::DoAppend(wxMenuItem *item)
wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Append()") ); wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Append()") );
m_items.Append(item); m_items.Append(item);
item->SetMenu((wxMenu*)this);
if ( item->IsSubMenu() ) if ( item->IsSubMenu() )
{ {
AddSubMenu(item->GetSubMenu()); 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()") ); wxCHECK_MSG( node, FALSE, wxT("invalid index in wxMenu::Insert()") );
m_items.Insert(node, item); m_items.Insert(node, item);
item->SetMenu((wxMenu*)this);
if ( item->IsSubMenu() ) if ( item->IsSubMenu() )
{ {
AddSubMenu(item->GetSubMenu()); AddSubMenu(item->GetSubMenu());
@@ -380,6 +382,7 @@ wxMenuItem *wxMenuBase::DoRemove(wxMenuItem *item)
m_items.DeleteNode(node); m_items.DeleteNode(node);
// item isn't attached to anything any more // item isn't attached to anything any more
item->SetMenu((wxMenu *)NULL);
wxMenu *submenu = item->GetSubMenu(); wxMenu *submenu = item->GetSubMenu();
if ( submenu ) if ( submenu )
{ {