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

Applied patch [ 649599 ] Fixes bug 610850: Inserting a menu

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-18 21:23:25 +00:00
parent 0cde01aedc
commit 75c116ab2c
3 changed files with 72 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gtk1/menu.cpp
View File

@@ -448,6 +448,36 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
return menuOld;
}
static wxMenu *CopyMenu (wxMenu *menu)
{
wxMenu *menucopy = new wxMenu ();
wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
while (node)
{
wxMenuItem *item = node->GetData();
int itemid = item->GetId();
wxString text = item->GetText();
text.Replace(wxT("_"), wxT("&"));
wxMenu *submenu = item->GetSubMenu();
if (!submenu)
{
wxMenuItem* itemcopy = new wxMenuItem(menucopy,
itemid, text,
menu->GetHelpString(itemid));
itemcopy->SetBitmap(item->GetBitmap());
itemcopy->SetCheckable(item->IsCheckable());
menucopy->Append(itemcopy);
}
else
menucopy->Append (itemid, text, CopyMenu(submenu),
menu->GetHelpString(itemid));
node = node->GetNext();
}
return menucopy;
}
wxMenu *wxMenuBar::Remove(size_t pos)
{
wxMenu *menu = wxMenuBarBase::Remove(pos);
@@ -461,13 +491,17 @@ wxMenu *wxMenuBar::Remove(size_t pos)
printf( "menu shell entries before %d\n", (int)g_list_length( menu_shell->children ) );
*/
wxMenu *menucopy = CopyMenu( menu );
// unparent calls unref() and that would delete the widget so we raise
// the ref count to 2 artificially before invoking unparent.
gtk_widget_ref( menu->m_menu );
gtk_widget_unparent( menu->m_menu );
gtk_widget_destroy( menu->m_owner );
delete menu;
menu = menucopy;
/*
printf( "factory entries after %d\n", (int)g_slist_length(m_factory->items) );
printf( "menu shell entries after %d\n", (int)g_list_length( menu_shell->children ) );